Merge branch 'hotfix/1.0.6.3' v1.0.6.3
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Sep 2014 16:02:38 +0000 (12:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Sep 2014 16:02:38 +0000 (12:02 -0400)

Trivial merge