From: bel2125 <bel2125@gmail.com>
Date: Mon, 28 Aug 2017 18:00:12 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Tag: 0.12.0~4^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f16e5b3e5c6842bc4f4fad3fbc87d825b667e2e;p=check

Merge branch 'master' into master
---

2f16e5b3e5c6842bc4f4fad3fbc87d825b667e2e