Forgot to add header here...
Merge branch 'master' into gui
Reversing python changes