Fixing some excuse generation issues from the recent merge.
Merge remote-tracking branch 'origin/master'