Merged changes from groovy-devel into hydro-devel.

@gavanderhoorn, please review.  I had to manually fix a merge issue in simple_socket.h, but otherwise merge was automatic.  Tests complete without any issues.