Follow padrino upstream changes