Merge branch 'hotfix/1.1.4' v1.1.4
authorIan Weller <ian@gaslightmedia.com>
Thu, 7 Aug 2014 14:57:33 +0000 (10:57 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 7 Aug 2014 14:57:33 +0000 (10:57 -0400)

Trivial merge