Merge branch 'hotfix/1.0.56' v1.0.56
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:42:36 +0000 (11:42 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:42:36 +0000 (11:42 -0500)

Trivial merge