Merge remote-tracking branch 'upstream/master'
authorSyrone Wong <wong.syrone@gmail.com>
Wed, 30 Mar 2016 13:44:56 +0000 (21:44 +0800)
committerSyrone Wong <wong.syrone@gmail.com>
Wed, 30 Mar 2016 13:44:56 +0000 (21:44 +0800)

Trivial merge