Merge branch 'hotfix/1.6.15' v1.6.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 20:31:15 +0000 (15:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 20:31:15 +0000 (15:31 -0500)

Trivial merge