Merge branch 'hotfix/1.0.3' v1.0.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 17:57:00 +0000 (13:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 17:57:00 +0000 (13:57 -0400)

Trivial merge