Merge branch 'release/2.1.8' into develop
Suppress UglifyJS2 warnings.
Merge branch 'release/2.1.8'