Merged changeset r9285:9377 from jblum/grc into trunk, with distcheck fixes