Merge branch 'master' into next

# Conflicts:
#	examples/aggressive-merging/README.md
#	examples/chunkhash/README.md
#	examples/code-splitted-css-bundle/README.md
#	examples/code-splitted-require.context-amd/README.md
#	examples/code-splitted-require.context/README.md
#	examples/code-splitting-bundle-loader/README.md
#	examples/code-splitting-harmony/README.md
#	examples/code-splitting-native-import-context/README.md
#	examples/code-splitting-specify-chunk-name/README.md
#	examples/code-splitting/README.md
#	examples/coffee-script/README.md
#	examples/common-chunk-and-vendor-chunk/README.md
#	examples/common-chunk-grandchildren/README.md
#	examples/commonjs/README.md
#	examples/css-bundle/README.md
#	examples/dll-app-and-vendor/0-vendor/README.md
#	examples/dll-app-and-vendor/1-app/README.md
#	examples/dll-user/README.md
#	examples/dll/README.md
#	examples/explicit-vendor-chunk/README.md
#	examples/externals/README.md
#	examples/extra-async-chunk-advanced/README.md
#	examples/extra-async-chunk/README.md
#	examples/harmony-interop/README.md
#	examples/harmony-library/README.md
#	examples/harmony-unused/README.md
#	examples/harmony/README.md
#	examples/http2-aggressive-splitting/README.md
#	examples/hybrid-routing/README.md
#	examples/i18n/README.md
#	examples/loader/README.md
#	examples/mixed/README.md
#	examples/move-to-parent/README.md
#	examples/multi-compiler/README.md
#	examples/multi-part-library/README.md
#	examples/multiple-commons-chunks/README.md
#	examples/multiple-entry-points-commons-chunk-css-bundle/README.md
#	examples/multiple-entry-points/README.md
#	examples/named-chunks/README.md
#	examples/require.context/README.md
#	examples/require.resolve/README.md
#	examples/scope-hoisting/README.md
#	examples/source-map/README.md
#	examples/two-explicit-vendor-chunks/README.md
#	examples/web-worker/README.md
#	package.json