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

[Bastien Montagne]

Commit: a6028f8e6b72066a69ea9467dafeca9f8d3bfc9c
Author: Bastien Montagne
Date:   Wed Oct 14 20:38:27 2015 +0200
Branches: id-remap
https://developer.blender.org/rBa6028f8e6b72066a69ea9467dafeca9f8d3bfc9c

Merge branch 'master' into id-remap

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



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