[Bf-blender-cvs] [c23509b] shapekeys-normals: Merge branch 'master' into shapekeys-normals

[Bastien Montagne]

Commit: c23509b6b8bce42b451b29cfb84e302037b6c393
Author: Bastien Montagne
Date:   Thu Oct 1 20:24:07 2015 +0200
Branches: shapekeys-normals
https://developer.blender.org/rBc23509b6b8bce42b451b29cfb84e302037b6c393

Merge branch 'master' into shapekeys-normals

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



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