Skip settings screen when option held down.
Merge branch 'skip' into develop