Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -6,7 +6,6 @@ next
   * Optimize userfile writing by doing it asynchronously
   * Add [bot]set var 'groups' to configure what groups bots are in
   * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
-  * Fix case where nick would rotate to NICK1 when already on NICK2 and NICK was unavailable
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
@@ -29,6 +28,7 @@ next
 maint
   * Fix various compile warnings with newer GCC
   * Fix bot getting confused when changing to long nicks
+  * Fix case where nick would rotate to NICK1 when already on NICK2 and NICK was unavailable
 
 1.3.3 - http://wraith.botpack.net/milestone/1.3.3
   * Fix --disable-ipv6 compiling