Merging 1.1 into 1.2 to keep up with changes.