Merge branch '1.4' of github.com:eclipse/paho.mqtt.c into 1.4

Merge branch '1.4' of github.com:eclipse/paho.mqtt.c into 1.4 #360