Option to 'stay on top', fixes #223
Merge branch 'master' into builds
7.594