Merge branch 'hotfix/1.5.15' v1.5.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Jul 2017 14:35:37 +0000 (10:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Jul 2017 14:35:37 +0000 (10:35 -0400)

Trivial merge