Gallery2: Fork for C++11 fixes.