[Bf-blender-cvs] [581a819] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 581a819432249186e917d641f8a310fdacd5e1d6
Author: Bastien Montagne
Date:   Sat Jul 2 15:30:54 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB581a819432249186e917d641f8a310fdacd5e1d6

Merge branch 'master' into asset-engine

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



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