This closes #117
authorAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Wed, 16 Jan 2019 02:12:07 +0000 (02:12 +0000)
committerAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Wed, 16 Jan 2019 02:12:07 +0000 (02:12 +0000)

Trivial merge