Prepare 6.0.1 #813

Merged
zxq9 merged 2 commits from prepare_6.0.1 into master 2021-06-24 16:38:05 +09:00