Merge branch 'hotfix/1.1.5' v1.1.5
authorIan Weller <ian@gaslightmedia.com>
Fri, 8 Aug 2014 15:49:31 +0000 (11:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 8 Aug 2014 15:49:31 +0000 (11:49 -0400)

Trivial merge