Merge branch 'hotfix/1.1.3' v1.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:45:23 +0000 (09:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:45:23 +0000 (09:45 -0400)

Trivial merge