Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 14 May 2015 09:07:02 +0000 (17:07 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 14 May 2015 09:07:02 +0000 (17:07 +0800)

Trivial merge