1215 - e4: refs to inexistent actions makes eclipse unusable
Merge remote-tracking branch 'upstream/pu' into pu