Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Jun 2017 15:16:13 +0000 (11:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Jun 2017 15:16:13 +0000 (11:16 -0400)

Trivial merge