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

[Bastien Montagne]

Commit: 2cac2ec7840bfeca5c0a4b5e47897723ec0ea8fa
Author: Bastien Montagne
Date:   Wed Jul 1 16:28:57 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB2cac2ec7840bfeca5c0a4b5e47897723ec0ea8fa

Merge branch 'master' into asset-experiments

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



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