[Bf-blender-cvs] [15336eb262f] blender2.8: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 15336eb262fe86ded768f43bda3aa11969a894fe
Author: Julian Eisel
Date:   Wed Mar 29 23:01:16 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB15336eb262fe86ded768f43bda3aa11969a894fe

Merge branch 'master' into blender2.8

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



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