Please don't merge until we are closer to launch.
Outstanding issues:
No changes between 4.1 and master