FIX: fixups std::string rfind + npos
Merge pull request #3659 from koying/quickpr2

FIX: fixups std::string rfind + npos