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

[Bastien Montagne]

Commit: fb43c076819bd04010e9858a546c30abc8c401e8
Author: Bastien Montagne
Date:   Sat Jun 27 23:15:58 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBfb43c076819bd04010e9858a546c30abc8c401e8

Merge branch 'master' into asset-experiments

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



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