Merge in jakar's fork.