Merge remote-tracking branch 'origin/master' into lo-dim-em-dev

# Conflicts:
#	.gitignore
#	examples/CMakeLists.txt
#	examples/makefile

fem/fe/fe_fixed_order.cpp

@@ -6035,6 +6035,15 @@ void RT0PyrFiniteElement::CalcVShape(const IntegrationPoint &ip,
       shape(4,1) = - 0.5;
       shape(4,2) =   1.0;
 
+      if (!rt0)
+      {
+         for (int i=1; i<5; i++)
+            for (int j=0; j<3; j++)
+            {
+               shape(i, j) *= 0.5;
+            }
+      }
+
       return;
    }