[Bf-blender-cvs] [4c8e2eb] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 4c8e2ebde25633a7990c9c8fe4ae5eadf1d89aae
Author: Bastien Montagne
Date:   Fri May 6 13:33:59 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB4c8e2ebde25633a7990c9c8fe4ae5eadf1d89aae

Merge branch 'master' into asset-experiments

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



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