fix apxs typo
Merge branch 'branch-1-0'