Merge branch 'master' of https://github.com/Eyescale/Equalizer
Merge branch 'master' into windowsettings
CR