Merge branch 'master' into 2-2-stable
Wrapped up loose ends
Conditionally displaying feed
Merge branch '2-2-stable'