[Bf-blender-cvs] [74dfca9] tmp-id-users: Merge branch 'master' into tmp-id-users

[Bastien Montagne]

Commit: 74dfca935ce17d13f034e1d3c768a394710be320
Author: Bastien Montagne
Date:   Wed Jan 6 16:16:48 2016 +0100
Branches: tmp-id-users
https://developer.blender.org/rB74dfca935ce17d13f034e1d3c768a394710be320

Merge branch 'master' into tmp-id-users

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



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