add semicolon
Merge branch '4.2-maint' into newdev