Merge branch 'release/1.0.36' v1.0.36
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 19 Feb 2019 15:37:31 +0000 (10:37 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 19 Feb 2019 15:37:31 +0000 (10:37 -0500)

Trivial merge