thehajime Merge pull request #525 from thehajime/merge-6.1