C++ update from Fedora 20 testing