Fix candidate to bug #615, http://bugs.skysql.com/show_bug.cgi?id=615
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop