Merge branch 'ng/4.8/master' into ng/4.8/mingw-libintl-revert