Issue #911 - fix media upload js files not always available on cpt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media

Conflicts:
	readme.txt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media
Merge branch 'pr/922'

Conflicts:
	readme.txt