plugins-commit
Merge remote-tracking branch 'upstream/master'
help-headtag-update_7/7/2014