Changing revision_history again.
Some merging from master.