Initial personal branching
Commit-test
Signed off up to and including 2.6 (Lamptest, enum)
Merge remote-tracking branch 'origin/bouke'