Merge branch 'release/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 14:21:40 +0000 (10:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 14:21:40 +0000 (10:21 -0400)

Trivial merge