Merge #243.