Added ZAF (bug 1088431)