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