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

[Bastien Montagne]

Commit: cc02a0a7e5c23dc324ccc16fcde9626d1f40b49a
Author: Bastien Montagne
Date:   Sat May 2 17:03:45 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBcc02a0a7e5c23dc324ccc16fcde9626d1f40b49a

Merge branch 'master' into asset-experiments

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



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