Merge branch 'master' into fix-issue-665
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 15 Oct 2018 11:47:18 +0000 (13:47 +0200)
committerGitHub <noreply@github.com>
Mon, 15 Oct 2018 11:47:18 +0000 (13:47 +0200)
commit6805d91033afc73404eeb1ca809f69e6518ede60
tree0de575249940d9fe006346903376cd531d46fcfa
parentdebe37308fc2dc3ade4445d13f87f8df3c5b747a
parent8da2b9dbf8b5a203e0a4a490619ebc30a6e05511
Merge branch 'master' into fix-issue-665