Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Wed, 11 Nov 2015 16:08:42 +0000 (00:08 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Wed, 11 Nov 2015 16:08:42 +0000 (00:08 +0800)

Trivial merge