Sync libneubot with bassosimone/libneubot