Merge branch 'hotfix/1.0.21' V1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 18:05:55 +0000 (14:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 18:05:55 +0000 (14:05 -0400)

Trivial merge