Merge branch 'master' into swing_gui