Merge branch 'master' into android
authorNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:27:08 +0000 (08:27 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:27:08 +0000 (08:27 +0200)
commit76f58e5637fb3b329ce15d847987f24b9fdaf04d
treeaa5d398f47c3230a9ef703e71562084e4201b0f1
parentc17f31dd9bdaa3eb8d73ee88ddf6617d14ef5e71
parente5a2f1b3d64907292ef59c6eae076354510e8641
Merge branch 'master' into android