[Bf-blender-cvs] [9bb32dd] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 9bb32dd4457f1c3b1f671c34883e0b6db5de201f
Author: Bastien Montagne
Date:   Fri Feb 19 10:48:24 2016 +0100
Branches: id-remap
https://developer.blender.org/rB9bb32dd4457f1c3b1f671c34883e0b6db5de201f

Merge branch 'master' into id-remap

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



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