Merged in changes from trunk