From: Bdale Garbee <bdale@gag.com>
Date: Tue, 9 Oct 2018 02:58:43 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.8
X-Git-Tag: 1.8.7~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f3330f019216ee2632f47be1fb06e158fb09d758

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

f3330f019216ee2632f47be1fb06e158fb09d758