Move things to ./common in preperation for factoring out into seperate repo
Merge remote-tracking branch 'common/master' into common