Merge branch 'hotfix/1.0.20' V1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:39:33 +0000 (10:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:39:33 +0000 (10:39 -0400)

Trivial merge