Merge branch 'release/1.6.61' v1.6.61
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 18:54:03 +0000 (14:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 18:54:03 +0000 (14:54 -0400)

Trivial merge