Imported package updates from trunk.