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

[Bastien Montagne]

Commit: 39da83e9740bfde40202e10816974c1e5517003d
Author: Bastien Montagne
Date:   Tue May 3 17:45:25 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB39da83e9740bfde40202e10816974c1e5517003d

Merge branch 'master' into asset-experiments

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



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