Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 13d4a6d..432c46d 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -157,3 +157,4 @@
42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
5285317ebb4e8e4f6d8d52b5616fa801e2ea844d jdk8-b35
+6a6ba0a07f33d37a2f97b1107e60c6a9a69ec84d jdk8-b36
diff --git a/common/autoconf/configure b/common/autoconf/configure
index 096fc73..13630cc 100644
--- a/common/autoconf/configure
+++ b/common/autoconf/configure
@@ -10489,7 +10489,7 @@
# Setup default logging of stdout and stderr to build.log in the output root.
BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-BUILD_LOG_WRAPPER='$(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
+BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
index e78f4fa..4c6b326 100644
--- a/common/autoconf/configure.ac
+++ b/common/autoconf/configure.ac
@@ -1004,7 +1004,7 @@
# Setup default logging of stdout and stderr to build.log in the output root.
BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-BUILD_LOG_WRAPPER='$(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
+BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
AC_SUBST(BUILD_LOG)
AC_SUBST(BUILD_LOG_WRAPPER)
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index d8da4eb..5a1b504 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -241,3 +241,4 @@
f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35
dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08
+50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 7e7ca57..6f8b44b 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -157,3 +157,4 @@
78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35
+45da9cb055ee258dc09e69c1718e27eadea38e45 jdk8-b36