Merge commit 'e19e5261159ac84517caf40f61f4e870f9965f6c' * commit 'e19e5261159ac84517caf40f61f4e870f9965f6c': Removing "summary"-style URIs.
Merge commit 'e19e5261159ac84517caf40f61f4e870f9965f6c' * commit 'e19e5261159ac84517caf40f61f4e870f9965f6c': Removing "summary"-style URIs.