Added "administer taxonomy" to local admin
Merge remote-tracking branch 'origin' into release