Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:35:50 +0000 (09:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:35:50 +0000 (09:35 -0400)

Trivial merge