Merge remote-tracking branch 'upstream/master'
authorSyrone Wong <wong.syrone@gmail.com>
Sun, 22 May 2016 06:14:54 +0000 (14:14 +0800)
committerSyrone Wong <wong.syrone@gmail.com>
Sun, 22 May 2016 06:14:54 +0000 (14:14 +0800)

Trivial merge