Merge of last few days of work on master into this branch