Merge branch 'master' into spartan-timesheet-restricted