Merge branch 'hotfix/1.1.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 7 Aug 2014 14:58:02 +0000 (10:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 7 Aug 2014 14:58:02 +0000 (10:58 -0400)

Trivial merge