Merge branch 'master' into comment-cache