manual merge of ie8 branch into 6.1.x