Merge branch 'time-series' into bdale-ui3 bdale-ui3
authorBdale Garbee <bdale@gag.com>
Fri, 12 May 2017 06:17:25 +0000 (00:17 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 12 May 2017 06:17:25 +0000 (00:17 -0600)

Trivial merge