Merge branch 'release/1.0.36' v1.0.36
authorIan Weller <ian@gaslightmedia.com>
Mon, 17 Jul 2017 19:44:52 +0000 (15:44 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 17 Jul 2017 19:44:52 +0000 (15:44 -0400)

Trivial merge