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
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

Conflicts:
	readme.txt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-1158-tax-index-dropdown

Conflicts:
	readme.txt
Merge pull request #1212 from jrfnl/Issue-1158-tax-index-dropdown

Fix issue #1158 tax index dropdown