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

[Bastien Montagne]

Commit: 9f176db5eaf413a332c42726a71aeb2de9590178
Author: Bastien Montagne
Date:   Sat Jul 4 01:42:37 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB9f176db5eaf413a332c42726a71aeb2de9590178

Merge branch 'master' into asset-experiments

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



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