Add/adjust changes from dr_kludge_at_users_sourceforge_net and Nick.
1 file changed