Merge in stephan's fork.