this fixes a lot of library startup problems
Merge remote-tracking branch 'origin/master'
lots of small fixes and sensible default for shortcuts module