upstream/3.6.1
088de2fb · Import eclipse-build trunk branch (revision 25506). ·