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

[Sybren A. Stüvel]

Commit: cc2d501642555616f3e8808bdbaa72f9c752e1a1
Author: Sybren A. Stüvel
Date:   Fri Apr 21 16:30:24 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBcc2d501642555616f3e8808bdbaa72f9c752e1a1

Merge branch 'master' into blender2.8

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



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