Merge branches 'development' and 'development' of github.com:prawnsalad/KiwiIRC into...