Merge branch 'feature-ospalh-special' into develop-ospalh-special
Merge remote-tracking branch 'ospalh/develop-ospalh-special' into develop-ospalh-special
pngcrush the icons, even when they seem to work OK.
Merge branch 'develop' into develop-ospalh-special