Merge changes from 1.2 branch (r470:483): Mostly build-related.
New error handling code, plus some small fixes from 1.2
Merge changes from 1.2 branch r456-468
