Merge branch 'master' into beauzo-changes
Merge branch 'beauzo-changes' of https://github.com/derecho2013/go-irc into beauzo-changes