merge and update
authorPeng Li <seudut@gmail.com>
Fri, 3 Mar 2017 16:09:10 +0000 (00:09 +0800)
committerPeng Li <seudut@gmail.com>
Fri, 3 Mar 2017 16:09:10 +0000 (00:09 +0800)

Trivial merge