external/Focal: Fork for C++11 fixes.