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

Trivial merge