Merge/master to java7 2

Trivial whitespace merge.

Review by @gkossakowski