Merge 1.2 Into Master

This pull request is merging the Atarashii! code at the 1.2 release into the master branch.