r13578: picking up missed commit (ran form source/ directory previously)