Merge branch 'hotfix/revert-yadis-fix'
Merge branch 'master' into newtheme