Merge remote-tracking branch 'upstream/master'
authorSyrone Wong <wong.syrone@gmail.com>
Sat, 28 May 2016 02:22:21 +0000 (10:22 +0800)
committerSyrone Wong <wong.syrone@gmail.com>
Sat, 28 May 2016 02:22:21 +0000 (10:22 +0800)

Trivial merge