Merge "Disable JavaScript for MSIE7 users, update tests accordingly"