More actual expected bot

Merge from master; I did a lot of pull request merges today.