From: Bdale Garbee <bdale@gag.com>
Date: Tue, 5 Jul 2016 08:23:18 +0000 (+0200)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.8~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=148b013dd29c26920ddfb53449ed4d8cc5a4b5ee

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

148b013dd29c26920ddfb53449ed4d8cc5a4b5ee