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

[Campbell Barton]

Commit: 5e04e4eb0d66d3862f3cc0ca77803171c0fc587f
Author: Campbell Barton
Date:   Sat Apr 29 03:23:54 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB5e04e4eb0d66d3862f3cc0ca77803171c0fc587f

Merge branch 'master' into blender2.8

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



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