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

[Campbell Barton]

Commit: f2a8b74c2572258391c5847c177e59266aee3dab
Author: Campbell Barton
Date:   Fri May 26 19:57:28 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBf2a8b74c2572258391c5847c177e59266aee3dab

Merge branch 'master' into blender2.8

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



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