Merge branch 'release/1.6.36' v1.6.36
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Apr 2017 16:03:49 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Apr 2017 16:03:49 +0000 (12:03 -0400)

Trivial merge