Merge branch 'hotfix/1.0.16' v1.0.16
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Dec 2018 18:28:59 +0000 (13:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Dec 2018 18:28:59 +0000 (13:28 -0500)

Trivial merge