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

[Bastien Montagne]

Commit: 2420f8a32ebf52c702212a67138ceb5eb88448dd
Author: Bastien Montagne
Date:   Sun Aug 30 11:40:04 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB2420f8a32ebf52c702212a67138ceb5eb88448dd

Merge branch 'master' into asset-experiments

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



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