Merging recent changes made in master into this working branch

cross your fingers!