Merge branch 'hotfix/1.1.31' v1.1.31
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 31 Oct 2017 14:14:04 +0000 (10:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 31 Oct 2017 14:14:04 +0000 (10:14 -0400)

Trivial merge