rst: update from trunk