merges for penelope.trac