Bug 964928 nightly firstrun

Ready for review/merge now.