Merge branch '9998-no-count-items-available'
authorTom Clegg <tom@curoverse.com>
Tue, 24 Jan 2017 20:28:37 +0000 (15:28 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 24 Jan 2017 20:28:37 +0000 (15:28 -0500)
closes #9998


Trivial merge