Added 5.3.1 to travis builds, as this is the oldest supported version.
Merge branch '1.6' into 1.7