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

[Julian Eisel]

Commit: b97db104383dc85edf208f67fa0caeff177bd76e
Author: Julian Eisel
Date:   Wed Jun 10 15:28:12 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rBb97db104383dc85edf208f67fa0caeff177bd76e

Merge branch 'master' into UI-experiments

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



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