Fix Trac issue #11487.
authorGeoffrey Mainland <mainland@apeiron.net>
Sun, 31 Jan 2016 18:35:41 +0000 (13:35 -0500)
committerGeoffrey Mainland <mainland@apeiron.net>
Sun, 31 Jan 2016 18:35:41 +0000 (13:35 -0500)

Trivial merge