Merge remote branch 'origin/feature/6852_WMatrixAvailibleOnWorkspace'
Merge remote branch 'origin/feature/6918_correct_error'
Re #6802. Encourage the first time setup window to stay on top.

It was not doing so on OS X Mountain Lion.
Merge branch 'feature/6802_first_time_setup_on_top' into develop