Changes for Mosquitto 1.2