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

[Bastien Montagne]

Commit: edd20977814820f63ad331092e99755ea74e2182
Author: Bastien Montagne
Date:   Wed Jan 6 19:25:46 2016 +0100
Branches: tmp-id-users
https://developer.blender.org/rBedd20977814820f63ad331092e99755ea74e2182

Merge branch 'master' into tmp-id-users

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



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