Merge webjars changes