Merge pull request #819 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Tue, 5 Jan 2016 21:27:06 +0000 (13:27 -0800)
committerJim Morris <morris@wolfman.com>
Tue, 5 Jan 2016 21:27:06 +0000 (13:27 -0800)
fix issue #818


Trivial merge