Merge tag 'v1.0.55' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 19:17:39 +0000 (14:17 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 19:17:39 +0000 (14:17 -0500)
v1.0.55


Trivial merge