Patch Set 3: Looks good to me, but someone else must approve; IP review completed

I added an attachment to a bug to see what it would look like for y'all...

https://bugs.eclipse.org/bugs/attachment.cgi?id=176796