Merge branch 'develop'
Merge branch 'develop'
Fix: Feeds menu did not refresh properly after tag update
Merge branch 'master' into develop