no more js files
merge upstream master