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

[Campbell Barton]

Commit: 2cfff95ba315c0650b0be4045dd4adc187bbf65b
Author: Campbell Barton
Date:   Wed Jun 15 17:41:22 2016 +1000
Branches: blender2.8
https://developer.blender.org/rB2cfff95ba315c0650b0be4045dd4adc187bbf65b

Merge branch 'master' into blender2.8

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



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