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

[Bastien Montagne]

Commit: cd980e85d762e536ac2b1e1b9e66bc61853c120b
Author: Bastien Montagne
Date:   Sun Jun 28 20:22:14 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBcd980e85d762e536ac2b1e1b9e66bc61853c120b

Merge branch 'master' into asset-experiments

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



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