Merging changes to 'Working copy' into 'master' ahead of tomorrow's meeting