Merge branch 'master' into travis-investigation
authorLuke Lau <luke_lau@icloud.com>
Tue, 31 Jul 2018 10:36:27 +0000 (11:36 +0100)
committerLuke Lau <luke_lau@icloud.com>
Tue, 31 Jul 2018 10:36:27 +0000 (11:36 +0100)

Trivial merge