Merge into master of manpower