Hell hath no fury like an IRC user scorned. (fixed notices)
Merge branch 'develop' into feature/refresh