applied changes from jts r919
applied changes from jts r922. NOTE: r920 and r921 ignored: no actual changes to apply
applied changes from jts r923
applied changes from jts r924