Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:45:47 +0000 (10:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:45:47 +0000 (10:45 -0400)

Trivial merge