Merge remote-tracking branch 'upstream/master'
authorroot <ngkaho1234@gmail.com>
Mon, 21 Sep 2015 22:47:59 +0000 (22:47 +0000)
committerroot <ngkaho1234@gmail.com>
Mon, 21 Sep 2015 22:47:59 +0000 (22:47 +0000)

Trivial merge