Merge branch 'release/1.5.36' v1.5.36
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Mar 2019 19:00:50 +0000 (15:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Mar 2019 19:00:50 +0000 (15:00 -0400)

Trivial merge