Merging aku's changes into the head.