Merge branch 'master' into 9998-no-count-items-available
authorTom Clegg <tom@curoverse.com>
Mon, 23 Jan 2017 15:41:24 +0000 (10:41 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 23 Jan 2017 15:41:24 +0000 (10:41 -0500)

Trivial merge