Cherry pick changes from master for the 2.8.1 release

Cherry pick fix for Ticket #996 (ie7 bug) and ticket 871 (map editor) and other small fixes