Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:16:12 +0000 (14:16 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:16:12 +0000 (14:16 -0400)

Trivial merge