Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Author: alalek

modules/optflow/src/pcaflow.cpp

@@ -40,8 +40,8 @@
  //
  //M*/
 
-#include "opencv2/ximgproc/edge_filter.hpp"
 #include "precomp.hpp"
+#include "opencv2/ximgproc/edge_filter.hpp"
 
 /* Disable "from double to float" and "from size_t to int" warnings.
  * Fixing these would make the code look ugly by introducing explicit cast all around.

modules/optflow/src/variational_refinement.cpp

@@ -40,8 +40,9 @@
 //
 //M*/
 
-#include "opencv2/core/hal/intrin.hpp"
 #include "precomp.hpp"
+#include "opencv2/core/hal/intrin.hpp"
+
 using namespace std;
 
 namespace cv