Merge branch 'hotfix/1.6.60' v1.6.60
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 17:14:27 +0000 (13:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 17:14:27 +0000 (13:14 -0400)

Trivial merge