return value!
scripted update of code from master at d8fde91 return value!