Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading