Layer test still failing on systems with coarse time (jvm on x64 ubuntu
for example)
Merge remote-tracking branch 'jaggr/master'