Merge "Use American spelling." into ics-factoryrom