Merge branch 'develop' of ssh://git.eclipse.org:29418/mosquitto/org.eclipse.mosquitto into develop
Conflicts: lib/messages_mosq.c lib/mosquitto.c src/conf.c src/database.c src/loop.c src/mosquitto_broker.h src/read_handle_server.cpull/139/head
commit
f3e216ee82