Merge branch 'master' of gitlab.tiker.net:xywei/lappy into add-feature-slicing