Fix minor typo

Pull in changes from master.