Merge branch 'hotfix/1.1.6' v1.1.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Aug 2014 17:07:48 +0000 (13:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Aug 2014 17:07:48 +0000 (13:07 -0400)

Trivial merge