Merge in latest from mongodb/morphia