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

[Bastien Montagne]

Commit: 317474e23122e9b1a91b0bc15ea6542a4fe42553
Author: Bastien Montagne
Date:   Sun Aug 23 15:08:17 2015 +0200
Branches: id-remap
https://developer.blender.org/rB317474e23122e9b1a91b0bc15ea6542a4fe42553

Merge branch 'master' into id-remap

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



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