This closes #2522
authorMichael Andre Pearce <michael.andre.pearce@me.com>
Thu, 14 Feb 2019 00:20:52 +0000 (00:20 +0000)
committerMichael Andre Pearce <michael.andre.pearce@me.com>
Thu, 14 Feb 2019 00:20:52 +0000 (00:20 +0000)

Trivial merge