Merge branch 'release/1.7.15' v1.7.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Jan 2019 18:33:35 +0000 (13:33 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Jan 2019 18:33:35 +0000 (13:33 -0500)

Trivial merge