Merge remote-tracking branch 'upstream/master'
authorSyrone Wong <wong.syrone@gmail.com>
Sun, 3 Apr 2016 12:56:11 +0000 (20:56 +0800)
committerSyrone Wong <wong.syrone@gmail.com>
Sun, 3 Apr 2016 12:56:11 +0000 (20:56 +0800)

Trivial merge