removed some unnecessary nesting
Merge branch 'master' into qt5