Merge pull request #3406 from alexanderkyte/mobile_static_default