* Fixed our previous pull/push/merge-mistake and compared differences
between a few previous versions to make sure we have a complete 'final'
version again.