[Bf-blender-cvs] [8b6928b] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 8b6928b2fb40bec3f68ed59336c2174c22e25b95
Author: Bastien Montagne
Date:   Sat Nov 7 10:54:48 2015 +0100
Branches: id-remap
https://developer.blender.org/rB8b6928b2fb40bec3f68ed59336c2174c22e25b95

Merge branch 'master' into id-remap

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



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