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

[Bastien Montagne]

Commit: b943f6fd2885087e4c890490bef5c1f5a0ecc699
Author: Bastien Montagne
Date:   Wed May 6 18:13:20 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBb943f6fd2885087e4c890490bef5c1f5a0ecc699

Merge branch 'master' into asset-experiments

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



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