Merge branch '00' into 00-copyright
mods entry
Merge branch '00-copyright' into 01-cleanup