[trac-peerreview-plugin/el6: 6/6] Merge remote-tracking branch 'origin/master' into el6