Added Edgar, added important info
Merge branch 'US1111' into trunk