Merge pull request #2 from PikachuEXE/master

Update upstream to 1.11.2
bump version to 1.11.2
Update upstream to 1.12.1