This closes #1837
authorMichael Andre Pearce <michael.andre.pearce@me.com>
Thu, 22 Feb 2018 20:34:16 +0000 (20:34 +0000)
committerMichael Andre Pearce <michael.andre.pearce@me.com>
Thu, 22 Feb 2018 20:34:16 +0000 (20:34 +0000)

Trivial merge