Latest merges from Jiri Kosina's hid branch.