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