[Bf-blender-cvs] [1705fd6] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 1705fd66d82b64b49b582bbd342fa121dc8388d8
Author: Bastien Montagne
Date:   Wed Jan 20 15:02:29 2016 +0100
Branches: id-remap
https://developer.blender.org/rB1705fd66d82b64b49b582bbd342fa121dc8388d8

Merge branch 'master' into id-remap

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



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