[Bf-blender-cvs] [3f4113c] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 3f4113ce3e2af8abcd4098aa3ad53b4067e62360
Author: Bastien Montagne
Date:   Tue Jun 7 10:10:14 2016 +0200
Branches: id-remap
https://developer.blender.org/rB3f4113ce3e2af8abcd4098aa3ad53b4067e62360

Merge branch 'master' into id-remap

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



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