Merge pull request #11761 from SteveCEvans/semicolon