[MERGE] branch merged with trunk-payroll