From: Bdale Garbee <bdale@gag.com>
Date: Mon, 11 Jan 2016 02:15:16 +0000 (-0700)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.2^0
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b53c78e75879d647935a30acb88fdd69467617a7

Merge branch 'master' into branch-1.6
---

b53c78e75879d647935a30acb88fdd69467617a7