trunk-merge

[Torsten Dettborn]

Hi Elliot,

after updating my local repository, my compiler throws a list of errors, how 
long would you need to fix it?

Torsten