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

Stefan and I implemented the comments of Shawn.

We know that we have to rebase this changeset and that this will force us to externalize strings. We'll work on that now while waiting for your comments.