Fixed: preview snippet for %%cf_<custom-field-name>%% and %%parent_title%%
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-916-cf-custom-field
Merge pull request #921 from jrfnl/Issue-916-cf-custom-field

Issue 916 - preview snippet for %%cf_<custom-field-name>%% and %%parent_title%% not resolving
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media

Conflicts:
	readme.txt