Merge branch 'fix __retval() being always ignored'