Merge branch 'hotfix/1.1.10'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Feb 2015 21:26:45 +0000 (16:26 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Feb 2015 21:26:45 +0000 (16:26 -0500)

Trivial merge