Added 9.3 branch, applied patches from Daniele Varrazzo.