Merge branch 'hotfix/1.0.16' v1.0.16
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Aug 2017 17:19:07 +0000 (13:19 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Aug 2017 17:19:07 +0000 (13:19 -0400)

Trivial merge