Prepare for future -std=c++1y