pulling commits from master before starting clamp-d3d9