Merge commit '0d0dc9de679d36b2fe78306e3e8f223d8baf5b62' into ha
authorWayne Schneider <wayne@indexdata.com>
Fri, 29 Jul 2016 17:41:27 +0000 (12:41 -0500)
committerWayne Schneider <wayne@indexdata.com>
Fri, 29 Jul 2016 17:41:27 +0000 (12:41 -0500)

Trivial merge