Merge of descr-branch back into trunk.
57 files changed