[Bf-blender-cvs] [e34888b80d8] soc-2017-package_manager: Merge branch 'master' of git.blender.org:blender into soc-2017-package_manager

[gandalf3]

Commit: e34888b80d87c17e6a253dfef08dcba853eb68ad
Author: gandalf3
Date:   Sat Aug 26 02:09:25 2017 -0700
Branches: soc-2017-package_manager
https://developer.blender.org/rBe34888b80d87c17e6a253dfef08dcba853eb68ad

Merge branch 'master' of git.blender.org:blender into soc-2017-package_manager

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



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