Merge branch 'master' into pr/878
authorIvoline Ngong <ivolinengong@gmail.com>
Wed, 29 May 2019 18:06:19 +0000 (21:06 +0300)
committerGitHub <noreply@github.com>
Wed, 29 May 2019 18:06:19 +0000 (21:06 +0300)

Trivial merge