Merge branch 'hotfix/1.1.21' v1.1.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 14:00:48 +0000 (10:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 14:00:48 +0000 (10:00 -0400)

Trivial merge