Added C++11 workaround.
Removed removed option.