expand trailing '+' when not part of version number
Merge pull request #4715 from rolandwalker/namer_trailing_plus

expand trailing '+' when not part of version number