ack-mode
Merge bug25433 into default
Merge default in.