Merge branch 'hotfix/1.1.10' v1.1.10
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:42:45 +0000 (16:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:42:45 +0000 (16:42 -0400)

Trivial merge