Merge "DO NOT MERGE." into eclair