Merge "Fix the broken build for JavaScript plugin" into devel/master