Fix for issue #306
Merge git://github.com/jdevalk/wordpress-seo into error-object-as-term

Conflicts:
	readme.txt
Merge git://github.com/jdevalk/wordpress-seo into error-object-as-term

Conflicts:
	readme.txt
Merge git://github.com/jdevalk/wordpress-seo into error-object-as-term

Conflicts:
	readme.txt
Merge remote-tracking branch 'jdevalk/master' into error-object-as-term

Conflicts:
	readme.txt
Manual merge of PR #501