[Bf-blender-cvs] [80b6a5e] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: 80b6a5e29ce7f0a0b9f5b3951f5532f799763b59
Author: Lukas Tönne
Date:   Fri Oct 9 15:04:09 2015 +0200
Branches: object_nodes
https://developer.blender.org/rB80b6a5e29ce7f0a0b9f5b3951f5532f799763b59

Merge branch 'master' into object_nodes

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



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