Merge branch 'hotfix/1.1.1' v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:17:41 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:17:41 +0000 (16:17 -0400)

Trivial merge