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

[Bastien Montagne]

Commit: 98654a9c9a8a9068e3368cf6530a2f27d958895c
Author: Bastien Montagne
Date:   Mon Jun 13 12:54:32 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB98654a9c9a8a9068e3368cf6530a2f27d958895c

Merge branch 'master' into asset-experiments

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



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