2.17

rebuild
Merge branch '2.1' of git@github.com:fffonion/RoameBot.git into 2.1