Workaround BOOST STRONG TYPEDEF
Merge branch 'vs2013' into vs2013-test01
Define compatibility types for main project space.
Change std::make_pair to std::pair for C++11.