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