Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 30 Jan 2016 08:25:55 +0000 (16:25 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 30 Jan 2016 08:25:55 +0000 (16:25 +0800)

Trivial merge