Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:25:56 +0000 (14:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:25:56 +0000 (14:25 -0500)

Trivial merge