Merge master into jeroendesloovere-fixes-#841-rss-link