Merges signup-wizard into master