Merge branch 'hotfix/1.0.30' v1.0.30
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 16:23:59 +0000 (12:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 16:23:59 +0000 (12:23 -0400)

Trivial merge