Pull from main Pele repository 03/12/14