[Bf-blender-cvs] [03d23c4] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 03d23c42a231791ce426fe3e2117c680b2e5cc8b
Author: Bastien Montagne
Date:   Wed Apr 27 11:02:04 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB03d23c42a231791ce426fe3e2117c680b2e5cc8b

Merge branch 'master' into asset-experiments

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



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