Merge branch 'hotfix/1.6.50' v1.6.50
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Jul 2017 18:12:21 +0000 (14:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Jul 2017 18:12:21 +0000 (14:12 -0400)

Trivial merge