Less prim peekaboo antics.
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
Merge remote-tracking branch 'shyotl/master'
Merge remote-tracking branch 'lirusaito/master'
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer