Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:19:14 +0000 (17:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:19:14 +0000 (17:19 -0500)

Trivial merge