Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jan 2015 18:35:27 +0000 (13:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jan 2015 18:35:27 +0000 (13:35 -0500)

Trivial merge