Upgrade WP and Jetpack
Merge branch 'master' into prod
Upgrade packages