editing bug fix
Merge branch 'daily_nobuild' into qt5