[Bf-blender-cvs] [283da2a] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 283da2a596e6edfb51625163537df48eab02a25f
Author: Bastien Montagne
Date:   Wed Sep 9 21:38:07 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB283da2a596e6edfb51625163537df48eab02a25f

Merge branch 'master' into asset-experiments

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



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