Merging latest changes to the rc-scripts branch. This merge is based upon revision 1767.
Changed paths: