Merge branch 'hotfix/1.0.3' v1.0.3
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:24:23 +0000 (11:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:24:23 +0000 (11:24 -0400)

Trivial merge