Merge branch 'marc'
Merge branch 'master' into marc
ok
Merge branch 'marc' of https://github.com/i07/HandyHelp into marc