Merge remote-tracking branch 'origin/macclane' into sb/spartan-recall-timesheet