Follow spec when collecting timings and settings
Merge pull request #408 from caitp/collect-timings-and-settings

Follow spec when collecting timings and settings