Merges #275