Merge remote-tracking branch 'origin/stable' into stable
commit6a40a43af4cb19aa31524adf670452c931fc4661
authorintrigeri <intrigeri@boum.org>
Sat, 20 Oct 2018 10:18:53 +0000 (20 10:18 +0000)
committerintrigeri <intrigeri@boum.org>
Sat, 20 Oct 2018 10:18:53 +0000 (20 10:18 +0000)
treed36bd4fff85c3ca2f848930342e6d8a0eff8984c
parent9554ae2756676a48c2a7d42abae1e6c2a68614c7
parentc65a06774ea2581c618987b903014ce1a819d505
Merge remote-tracking branch 'origin/stable' into stable