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

[Bastien Montagne]

Commit: 9ebdab0e17cb6dffa186dba40389ad300fe6e712
Author: Bastien Montagne
Date:   Sun Aug 9 16:09:23 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB9ebdab0e17cb6dffa186dba40389ad300fe6e712

Merge branch 'master' into asset-experiments

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



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