Merge "Make DateFormatter::getInstance use APC"