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

[Bastien Montagne]

Commit: dc659c05d477a88a82717f2f16ce7ba15bcbb864
Author: Bastien Montagne
Date:   Mon Aug 10 18:04:13 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBdc659c05d477a88a82717f2f16ce7ba15bcbb864

Merge branch 'master' into asset-experiments

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



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