Merge remote-tracking branch 'upstream/master'
authorSyrone Wong <wong.syrone@gmail.com>
Fri, 17 Jun 2016 12:20:43 +0000 (20:20 +0800)
committerSyrone Wong <wong.syrone@gmail.com>
Fri, 17 Jun 2016 12:20:43 +0000 (20:20 +0800)

Trivial merge