Catch up to date with willie#4

Merged

maxpowa merged 1 commit intomaxpowa:masterfrom sopel-irc:master

Feb 20, 2015

Commits on Feb 19, 2015

Merge pull request #746 from janandjohn3/patch-1
embolalia
committed