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

[Bastien Montagne]

Commit: 60c5b3f76fe7c7027b7637f9d53e657ffd6d0402
Author: Bastien Montagne
Date:   Thu Jun 15 16:37:10 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB60c5b3f76fe7c7027b7637f9d53e657ffd6d0402

Merge branch 'master' into blender2.8

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



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