Fixes #6321
Fixes #6608
Fixes #6732
Fixes #6731
Fixes #6728
Fixes #6727
Fixes #6726
Possible fix for #6729
Fixes #6725
Fixes #6724
Fixes #6705
Fixes #6704
Merge pull request #6734 from Zuhayr/master

Fixes
Merge pull request #6737 from comma/conscience

Couple o fixes
Merge pull request #6749 from Baystation12/master

Master -> Freeze
Merge pull request #6750 from Baystation12/dev-freeze

Dev freeze -> Dev