From: Bdale Garbee <bdale@gag.com>
Date: Mon, 8 Oct 2018 23:49:47 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.8
X-Git-Tag: 1.8.7~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=34658a1236e34891b41a0a51a480717db98779e7

Merge branch 'master' into branch-1.8
---

34658a1236e34891b41a0a51a480717db98779e7