Merge branch 'hotfix/1.0.36' v1.0.36
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:21:15 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:21:15 +0000 (11:21 -0500)

Trivial merge