[Bf-blender-cvs] [86f4299] temp-openjpeg21: Merge branch 'master' into temp-openjpeg21

[Sergey Sharybin]

Commit: 86f4299a3ab55ce5e9a3b7eda4c942b2b6448544
Author: Sergey Sharybin
Date:   Wed Nov 2 10:16:59 2016 +0100
Branches: temp-openjpeg21
https://developer.blender.org/rB86f4299a3ab55ce5e9a3b7eda4c942b2b6448544

Merge branch 'master' into temp-openjpeg21

===================================================================



===================================================================