From: Bdale Garbee <bdale@gag.com>
Date: Fri, 17 Jun 2016 16:00:10 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.4~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=31cf047113ec72a78f4b500223a2c6be23bc86fd

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

31cf047113ec72a78f4b500223a2c6be23bc86fd