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

- rebased via "git rebase --onto master 76f76715" to avoid rebasing
76f76715 again which was already submitted to master earlier
- fixed typo in FileDiff