Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:47:57 +0000 (15:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:47:57 +0000 (15:47 -0400)

Trivial merge