Merge branch 'hotfix/1.6.71' v1.6.71
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Nov 2017 13:20:55 +0000 (08:20 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Nov 2017 13:20:55 +0000 (08:20 -0500)

Trivial merge