Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Tue, 3 Nov 2015 16:54:27 +0000 (00:54 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Tue, 3 Nov 2015 16:54:27 +0000 (00:54 +0800)

Trivial merge