Merge master into employee

Merge master into employee to try and resolve issues.