Merge branch 'master' into prelude-personal
Merge branch 'prelude-personal' of https://github.com/shiquanwang/prelude into prelude-personal