Merge branch 'hotfix/1.6.31' v1.6.31
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 18:16:42 +0000 (14:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 18:16:42 +0000 (14:16 -0400)

Trivial merge