Merge "Revert "Added C++11 flag to RS support.""