Merge branch 'hotfix/1.0.55' v1.0.55
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 19:17:35 +0000 (14:17 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 19:17:35 +0000 (14:17 -0500)

Trivial merge