Merge branch 'release/1.0.60' v1.0.60
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 13:08:50 +0000 (09:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 13:08:50 +0000 (09:08 -0400)

Trivial merge