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