Merge branch 'hotfix/1.1.20' v1.1.20
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 21:17:19 +0000 (16:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 21:17:19 +0000 (16:17 -0500)

Trivial merge