Argh!
1440: I hate startup issues. :(
Merge branch 'master' into next