Merge branch 'hotfix/1.1.4' v1.1.4
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 19:04:06 +0000 (15:04 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 19:04:06 +0000 (15:04 -0400)

Trivial merge