Updates from official 1.3.7 release.
Updates to dependency in maven.