Merge branch 'hotfix/1.0.9' v1.0.9
authorlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:32:45 +0000 (16:32 -0400)
committerlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:32:45 +0000 (16:32 -0400)

Trivial merge