Merge branch 'master' into soc-2018-npr
authorYiming Wu <xp8110@outlook.com>
Fri, 28 Dec 2018 02:59:36 +0000 (10:59 +0800)
committerYiming Wu <xp8110@outlook.com>
Fri, 28 Dec 2018 02:59:36 +0000 (10:59 +0800)

Trivial merge