Merging dev to master

Please read the Changelog, run the patcher and make the proper file changes before submitting a bug report.