Incremented th version number.
Merge branch 'master' into 1.0, removing any changes from 'master'. We
effectively reverted all the 2.0 branch changes.