Merge from fork made by author.