Merged revisions 317 and 318 from trunk to the branches