Bumping to version 4.7.0.
Auto-merge remote-tracking branch 'upstream/master'