Merge branch 'hotfix/1.0.36' v1.0.36
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 21:11:52 +0000 (16:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 21:11:52 +0000 (16:11 -0500)

Trivial merge