Module updates and C++11 porting