Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Dec 2014 16:34:02 +0000 (11:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Dec 2014 16:34:02 +0000 (11:34 -0500)

Trivial merge