Merge branch 'release/1.6.35' v1.6.35
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 18:51:35 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 18:51:35 +0000 (14:51 -0400)

Trivial merge