Final pre-release merge of Andrew's changes.