Merge remote-tracking branch 'upstream/master'
authorSyrone Wong <wong.syrone@gmail.com>
Thu, 21 Apr 2016 11:04:44 +0000 (19:04 +0800)
committerSyrone Wong <wong.syrone@gmail.com>
Thu, 21 Apr 2016 11:04:44 +0000 (19:04 +0800)

Trivial merge