Merge branch '8953-no-double-count' refs #8953
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 20 Apr 2016 13:10:33 +0000 (09:10 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 20 Apr 2016 13:10:33 +0000 (09:10 -0400)

Trivial merge