Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:59:05 +0000 (14:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:59:05 +0000 (14:59 -0400)

Trivial merge