Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 30 Apr 2015 15:33:49 +0000 (23:33 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 30 Apr 2015 15:33:49 +0000 (23:33 +0800)

Trivial merge