Merge branch 'master' into gui
Merge branch 'gui'