Reenable edgetapper
Merge branch 'master' of github.com:blegat/LFSAB1507