Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:30:01 +0000 (15:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:30:01 +0000 (15:30 -0500)

Trivial merge