From: Bdale Garbee <bdale@gag.com>
Date: Sun, 18 Mar 2018 21:47:31 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.8
X-Git-Tag: 1.8.5~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7b614380f307cb5e27f2a05281bc76c4ace93334;p=fw%2Faltos

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

7b614380f307cb5e27f2a05281bc76c4ace93334