Merged upstream master

diff --cc modules/java/generator/rst_parser.py
index d2c3d40,f236316..750d6f0
--- 1/modules/java/generator/rst_parser.py
--- 2/modules/java/generator/rst_parser.py
+++ b/modules/java/generator/rst_parser.py
@@@ -1,9 -1,7 +1,8 @@@
  #!/usr/bin/env python
  
 +from __future__ import print_function
  import os, sys, re, string, fnmatch
- 
- allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "ocl", "softcascade", "superres"]
+ allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "softcascade", "superres"]
  verbose = False
  show_warnings = True
  show_errors = True