Merging the v0.4.1 into our custom mobile-defense-production branch

This should bring our custom branch up to date so we can use the --visible-to-all-users option