Merge commit 'refs/merge-requests/7' of git://gitorious.org/gamergate/gamergate into...