Dear diary:  today I changed 800 lines (3535)
Merge branch 'master' into naamblok