Merge branch 'master' of https://github.com/ga4gh/schemas into patch-4

Conflicts:
	src/main/resources/avro/readmethods.avdl