Merge branch 'release/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 19:29:51 +0000 (15:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 19:29:51 +0000 (15:29 -0400)

Trivial merge