Merge changes from 1.2 branch (r470:483): Mostly build-related.
Merge changes from 1.2 branch r456-468