Merge remote-tracking branch 'upstream/master' into remove_devserver_special_treatement
Remove comment which no longer is applicable
Merge branch 'remove_devserver_special_treatement'