From: Bdale Garbee <bdale@gag.com>
Date: Tue, 12 Dec 2017 04:37:48 +0000 (-0700)
Subject: Merge branch 'master' into branch-1.8
X-Git-Tag: 1.8.3~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ea0aa97fb93e669868a6f2c49c5d4b46e7615b1f

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

ea0aa97fb93e669868a6f2c49c5d4b46e7615b1f