Merge remote-tracking branch 'upstream/develop' into develop
authorAndyHee <andy@hubup.pro>
Sat, 10 Nov 2018 04:17:47 +0000 (11:17 +0700)
committerAndyHee <andy@hubup.pro>
Sat, 10 Nov 2018 04:17:47 +0000 (11:17 +0700)

Trivial merge