Remove G_vmlCanvasManager support
Merge /w master