[Bf-blender-cvs] [0c8b1a8] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 0c8b1a8c3721bd348e5b2b5c755b76b22bef1eb9
Author: Bastien Montagne
Date:   Fri Nov 6 12:35:45 2015 +0100
Branches: id-remap
https://developer.blender.org/rB0c8b1a8c3721bd348e5b2b5c755b76b22bef1eb9

Merge branch 'master' into id-remap

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



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