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

[Campbell Barton]

Commit: 0e0888970d4dca7f8355daf4da647f6d6dda9a28
Author: Campbell Barton
Date:   Thu May 11 22:06:55 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB0e0888970d4dca7f8355daf4da647f6d6dda9a28

Merge branch 'master' into blender2.8

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



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