Merge pull request #3 from KoffeinFlummi/master

Fork Update
Updated changelog for #1225 number 2
Merge pull request #1362 from jonpas/master

Changelog update for #1225 number 2