Merge branch 'master' into travis-windows
authorLuke Lau <luke_lau@icloud.com>
Wed, 5 Dec 2018 01:27:56 +0000 (01:27 +0000)
committerLuke Lau <luke_lau@icloud.com>
Wed, 5 Dec 2018 01:27:56 +0000 (01:27 +0000)

Trivial merge