port to Luna

See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=428301