Rebase master
defer the last gulp tasks so they run in the main thread