Fix: taxonomy meta field description was only shown for text fields
Fix issue #1158 - Show taxonomy index meta field regardless of blog-wide setting
esc_html the tax met field description on function call, not within function to allow passing some html
Updated changelog
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-1158-tax-index-dropdown
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-1158-tax-index-dropdown

Conflicts:
	readme.txt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-1158-tax-index-dropdown
Minor changes for improved output of WP hook documentor
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-1158-tax-index-dropdown
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Minor-changes-4-improved-apidoc-results
Fix issue #1004 - empty urlset on taxonomy sitemap
Fix deprecated function messages

`__METHOD__` already includes classname
Various codestyle fixes based on new release of WP code sniffs
Update phpcs config file for new WPCS release
Adjust Travis to work with new WPCS release
Remove one sniff as if doesn't work on PHP 5.2 - issue filed
Added CDATA in image captions and titles
Escape Google+ description output. Fixes #1253
Merge pull request #1251 from jrfnl/Fix-phpcs-failing

Fix phpcs failing, props @jrfnl
Merge pull request #1252 from Petervw/master

Added CDATA in image captions and titles