Merge branch 'hotfix/1.1.9' v1.1.9
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Feb 2015 14:10:21 +0000 (09:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Feb 2015 14:10:21 +0000 (09:10 -0500)

Trivial merge