Grab all the changes from winhamwr's fork.