Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 19:04:44 +0000 (03:04 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 19:04:44 +0000 (03:04 +0800)

Trivial merge