Merge branch 'ping-patch-8239'
authorYen Chi Hsuan <yan12125@gmail.com>
Tue, 19 Jan 2016 20:22:25 +0000 (04:22 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Tue, 19 Jan 2016 20:22:25 +0000 (04:22 +0800)

Trivial merge