Slightly sped up first start with FPP
Merge branch 'master' into faster