-Merged changes from master
-MQTT fixes