Bugfix and associated test.

2 jobs for data-layouts in 12 minutes and 17 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #28544
make:generic

00:06:36

passed #28545
make:knl

00:05:41