Merge branch 'master' of git://github.com/jdevalk/wordpress-seo into Enhancement-breadcrumbs-cpt
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo into Enhancement-breadcrumbs-cpt
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo into Enhancement-breadcrumbs-cpt
Properly do Yoast tracking cron job scheduling & (especially) unscheduling
Updated the changelog for the cron job scheduling change
Grrr... forgot to remove class visibility...
Fixed issue #327 [Missing argument 3 for wpseo_upgrader_process_complete](https://github.com/Yoast/wordpress-seo/issues/327) notice for WP 3.7+
Merge branch 'master' into Fix-settings-issues

Conflicts:
	inc/wpseo-functions.php