SVN revisions 935-940 merge from Zebra CVS.
15 files changed