Refresh from upstream
Merge branch 'master' of https://github.com/cxl000/mer-nuclear