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

[Campbell Barton]

Commit: 33a5248b6c82d7930089544be10480fa0a25aa80
Author: Campbell Barton
Date:   Sat Apr 29 16:32:25 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB33a5248b6c82d7930089544be10480fa0a25aa80

Merge branch 'master' into blender2.8

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



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