From: Bdale Garbee <bdale@gag.com>
Date: Tue, 19 Sep 2017 02:35:00 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.8
X-Git-Tag: 1.8.2~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b12e982259817328e348f1aaa91c5c824891e7b9

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

b12e982259817328e348f1aaa91c5c824891e7b9