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)
commita910d74e3d186220c1bbf56f5236ce6e171b259c
tree18820c9faa363431bd111448b914eef46604562e
parenta49c04220da70ad6b6c5aef344b12bd3d3cd10a1
parenta9cff941ac28ce31c8463b6bd84237c0eeee06ea
Merge branch 'master' into travis-windows