From: Bdale Garbee <bdale@gag.com>
Date: Mon, 4 Jul 2016 21:47:24 +0000 (+0200)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.5~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=2e26d1ab42163988dc26b06b016c3b05efe17659

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

2e26d1ab42163988dc26b06b016c3b05efe17659