[Bf-blender-cvs] [4286b60] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 4286b606b36a45208c8e17ec58f8ec6558786bd6
Author: Bastien Montagne
Date:   Mon Jun 13 12:50:06 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB4286b606b36a45208c8e17ec58f8ec6558786bd6

Merge branch 'master' into asset-engine

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



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