Merge master to java7 branch

There were no conflicts during merge so nothing to review really.

However, I'd still like to request for stamp of approval from @paulp.