Merge of branch 2.0.1.1-externalurls with trunk