Fix aropt error message
0 + plural
Use coffeescript
Merge branch 'v1.13.x' into sam_2537
Merge branch 'sam_2537' into sam_2563