Merge branch 'master' into dxva

Conflicts:
	common/trace_parser_flags.cpp

diff --cc wrappers/CMakeLists.txt
Simple merge

diff --cc wrappers/d3d9trace.py
index 17ebe197d872a17b5dcf779dbcc0b123676861af,df39927f787a7854a233eb4689d9e39698aca4b7..33f6e9d9dfbfa18b5fae730d31fb0552803925b6
--- 1/wrappers/d3d9trace.py
--- 2/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@@ -84,9 -77,8 +85,9 @@@ if __name__ == '__main__'
      print '#include "os.hpp"'
      print
      print '#include "d3d9imports.hpp"'
-     print '#include "d3dsize.hpp"'
+     print '#include "d3d9size.hpp"'
      print '#include "d3d9shader.hpp"'
 +    print '#include "dxvaint.h"'
      print
      print '''
  static inline size_t