Merge tag 'v1.0.54' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:02:38 +0000 (17:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:02:38 +0000 (17:02 -0500)
v1.0.54


Trivial merge