Initial commit from local backup after crash of opensource.luminis.net
Merge remote-tracking branch 'origin/master'