Fixed invalid use after scope
Merge remote-tracking branch 'origin/master' into v1.4
Bump version number