Merge in Ampersandy's fork.