sane patch number
merge some changes from HEAD
more confing updates
even more config updates from HEAD
let's call it lts