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

[Campbell Barton]

Commit: 917d069cdb938306f0d1b5575066e9685abaedce
Author: Campbell Barton
Date:   Wed Aug 23 19:21:52 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB917d069cdb938306f0d1b5575066e9685abaedce

Merge branch 'master' into blender2.8

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



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