Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:13:33 +0000 (15:13 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:13:33 +0000 (15:13 -0500)

Trivial merge