THis fixes #8218.  This was another regression from bug #8213.  I think I got it all sorted out this time.
Changed the version to rc6