Merge remote-tracking branch 'upstream/develop' into develop
authorAndyHee <andy@hubup.pro>
Mon, 19 Nov 2018 14:54:56 +0000 (21:54 +0700)
committerAndyHee <andy@hubup.pro>
Mon, 19 Nov 2018 14:54:56 +0000 (21:54 +0700)

Trivial merge