Merge remote-tracking branch 'upstream/master' into develop
authorAndyHee <andy@hubup.pro>
Wed, 7 Nov 2018 14:05:12 +0000 (21:05 +0700)
committerAndyHee <andy@hubup.pro>
Wed, 7 Nov 2018 14:05:12 +0000 (21:05 +0700)

Trivial merge