[Bf-blender-cvs] [978cbb7] UI-experiments: Merge branch 'master' into UI-experiments

[Julian Eisel]

Commit: 978cbb74868109da0d3a1be211e72095acd17731
Author: Julian Eisel
Date:   Wed Aug 26 18:14:00 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB978cbb74868109da0d3a1be211e72095acd17731

Merge branch 'master' into UI-experiments

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



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