Merge with import of DevBase submissions

...with a lot of help from Andreas Bolka (aka earl).