Merge branch 'release/1.1.31' v1.1.31
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Nov 2017 13:04:48 +0000 (08:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Nov 2017 13:04:48 +0000 (08:04 -0500)

Trivial merge