Merge branch 'fixes' into develop

src/MQTTAsync.c

@@ -2333,7 +2333,7 @@ int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options)
 	m->c->username = options->username;
 	m->c->password = options->password;
 	if (options->password)
-		m->c->passwordlen = strlen(options->password) + 1;
+		m->c->passwordlen = strlen(options->password);
 	else if (options->struct_version >= 5 && options->binarypwd.data)
 	{
 		m->c->password = options->binarypwd.data;

src/MQTTClient.c

@@ -1114,7 +1114,7 @@ static int MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectOptions* o
 	m->c->username = options->username;
 	m->c->password = options->password;
 	if (options->password)
-		m->c->passwordlen = strlen(options->password) + 1;
+		m->c->passwordlen = strlen(options->password);
 	else if (options->struct_version >= 5 && options->binarypwd.data)
 	{
 		m->c->password = options->binarypwd.data;

travis-build.sh

@@ -10,7 +10,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
   make
   python ../test/mqttsas2.py &
   ctest -VV --timeout 600
-  kill %1 
+  kill %1
   killall mosquitto
 fi
 
@@ -22,6 +22,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
   make
   python ../test/mqttsas2.py &
   ctest -VV --timeout 600
-  kill %1 
+  kill %1
   killall mosquitto
 fi