Merge of descr-branch back into trunk.