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

[Bastien Montagne]

Commit: e6fa18cebfa26a37e1fee1adeeb54e4440e88cb6
Author: Bastien Montagne
Date:   Sun Sep 27 11:29:39 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBe6fa18cebfa26a37e1fee1adeeb54e4440e88cb6

Merge branch 'master' into asset-experiments

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



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