Merge pull request #703 from xiaohutai/master

Fixes for MetaTags extension
Make usage of taxonomies a bit less strict, again. Addendum to #670.
Merge remote-tracking branch 'upstream/master'