Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:18:08 +0000 (12:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:18:08 +0000 (12:18 -0400)

Trivial merge