[Bf-blender-cvs] [209d4d6993] blender2.8: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 209d4d6993e3ce3ccc7677530b0b678a22e3607a
Author: Julian Eisel
Date:   Wed Mar 15 20:28:12 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB209d4d6993e3ce3ccc7677530b0b678a22e3607a

Merge branch 'master' into blender2.8

Needed for compile fix.

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



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