Merged in #157.