Merge tag 'v1.2.31' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 17:04:58 +0000 (12:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 17:04:58 +0000 (12:04 -0500)
v1.2.31


Trivial merge