Merge tag 'v1.2.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:52 +0000 (14:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:52 +0000 (14:34 -0500)
v1.2.5


Trivial merge