Merge of changes which wouldn't push properly.