Merge branch 'hotfix/1.0.16' v1.0.16
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Nov 2018 21:00:03 +0000 (16:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Nov 2018 21:00:03 +0000 (16:00 -0500)

Trivial merge