Merge branch 'hotfix/1.1.10' v1.1.10
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:30:54 +0000 (16:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:30:54 +0000 (16:30 -0400)

Trivial merge