K 10 svn:author V 6 gerald K 8 svn:date V 27 2012-07-14T01:28:09.000000Z K 7 svn:log V 90 Adapt to the new options framework. Reviewed by: David Naylor END