Merge branch 'master' into wrap_comment_warnings

diff --cc include/deal.II/meshworker/scratch_data.h
index 354a24b2846e26bfc7b2901bcb2af12d8e061130,5c9343bc1279432adc80613836b7531fc3b6115e..ace014c637ca35f5ae4183ac0b529ace2278313b
--- 1/include/deal.II/meshworker/scratch_data.h
--- 2/include/deal.II/meshworker/scratch_data.h
+++ b/include/deal.II/meshworker/scratch_data.h
@@@ -86,12 -82,9 +86,12 @@@ namespace MeshWorke
     * discontinuous Galerkin methods).
     *
     * If you need to retrieve values or gradients of finite element solution
-    * vectors, on the cell, face, or subface that has just beeing initialized
+    * vectors, on the cell, face, or subface that has just been initialized
 -   * with one of the functions in @ref CurrentCellMethods, you can use the
 -   * methods in @ref CurrentCellEvaluation.
 +   * with one of the functions in
 +   * @ref CurrentCellMethods,
 +   * you can use the
 +   * methods in
 +   * @ref CurrentCellEvaluation.
     *
     * An example usage for this class is given by the following snippet of code:
     *