log glue at startup
Merge remote-tracking branch 'jeko/master'
bugfix
Merge remote-tracking branch 'spa/master'