Merge branch 'hotfix/1.1.9' v1.1.9
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 18:24:38 +0000 (14:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 18:24:38 +0000 (14:24 -0400)

Trivial merge