Catch JDLH fork up with thomasvs:master

Catch JDLH fork up with thomasvs:master