Merge branch 'hotfix/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Dec 2017 15:47:31 +0000 (10:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Dec 2017 15:47:31 +0000 (10:47 -0500)

Trivial merge