Merge branch 'hotfix/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:24:54 +0000 (11:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:24:54 +0000 (11:24 -0400)

Trivial merge