The 'never ever use --overwrite again' merge This branch has become a mess because someone reverted changes and used something similar to --overwrite without checking which changes were reverted. With this commit I try to fix the state of this branch, all unittests run sucessfully. Please check if all changes you made to this branch after 2009-11-14 are there. Also please never use --overwrite again, and make sure to always run the unittests before commiting, even before commiting oneline changes, thank you