[Bf-blender-cvs] [076564e] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: 076564e5bd9a16099eb5e755ce9fd479b3fd1cc1
Author: Lukas Tönne
Date:   Mon May 16 12:45:24 2016 +0200
Branches: object_nodes
https://developer.blender.org/rB076564e5bd9a16099eb5e755ce9fd479b3fd1cc1

Merge branch 'master' into object_nodes

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



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