Try to merge with post-vacation updates
Merge branch 'master' of https://github.com/QCBS/chauvesouris
multiple changes from the past 2 weeks