merge in work from angular languageforge
merge from lf