Merge final tweaks made for v4.
Merge branch 'master' of github.com:Automattic/jetpack-start