- code simplified. - elided text fixed. Tuleap: #275 Change-Id: I1d085253d1a4d2a298be00e80297b1bc65f4e5db