Merge remote-tracking branch 'origin/gcc-4_7-branch' into ng/4.7/master