[Bf-blender-cvs] [8c732bd] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 8c732bd0f2c6815b25c650b578d34e6073a2c66b
Author: Bastien Montagne
Date:   Wed Sep 14 17:27:56 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB8c732bd0f2c6815b25c650b578d34e6073a2c66b

Merge branch 'master' into asset-engine

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



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