diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml
index fa58b32b3..be8c3933a 100644
--- a/antlr4-maven-plugin/pom.xml
+++ b/antlr4-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.antlr</groupId>
     <artifactId>antlr4-master</artifactId>
-    <version>4.8-2-SNAPSHOT</version>
+    <version>4.9-SNAPSHOT</version>
   </parent>
   <artifactId>antlr4-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
diff --git a/doc/releasing-antlr.md b/doc/releasing-antlr.md
index e6e83478d..c3edb48b3 100644
--- a/doc/releasing-antlr.md
+++ b/doc/releasing-antlr.md
@@ -199,10 +199,10 @@ export GPG_TTY=$(tty)
 Side note to set jdk 1.7 on os x:
 
 ```bash
-alias java='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/java'
-alias javac='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/javac'
-alias javadoc='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/javadoc'
-alias jar='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/jar'
+alias java="`/usr/libexec/java_home -v 1.7`/bin/java"
+alias javac="`/usr/libexec/java_home -v 1.7`/bin/javac"
+alias javadoc="`/usr/libexec/java_home -v 1.7`/bin/javadoc"
+alias jar="`/usr/libexec/java_home -v 1.7`/bin/jar"
 export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
 ```
 
diff --git a/pom.xml b/pom.xml
index 5c7a93549..3f01a0076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	</parent>
 	<groupId>org.antlr</groupId>
 	<artifactId>antlr4-master</artifactId>
-	<version>4.8-2-SNAPSHOT</version>
+	<version>4.9-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ANTLR 4</name>
diff --git a/runtime-testsuite/annotations/pom.xml b/runtime-testsuite/annotations/pom.xml
index 97bf78649..eaef576f3 100644
--- a/runtime-testsuite/annotations/pom.xml
+++ b/runtime-testsuite/annotations/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.antlr</groupId>
     <artifactId>antlr4-master</artifactId>
-    <version>4.8-2-SNAPSHOT</version>
+    <version>4.9-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>antlr4-runtime-test-annotations</artifactId>
diff --git a/runtime-testsuite/pom.xml b/runtime-testsuite/pom.xml
index b6368917d..f89b37edc 100644
--- a/runtime-testsuite/pom.xml
+++ b/runtime-testsuite/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.antlr</groupId>
 		<artifactId>antlr4-master</artifactId>
-		<version>4.8-2-SNAPSHOT</version>
+		<version>4.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>antlr4-runtime-testsuite</artifactId>
 	<name>ANTLR 4 Runtime Tests (2nd generation)</name>
diff --git a/runtime-testsuite/processors/pom.xml b/runtime-testsuite/processors/pom.xml
index c417c626d..234cf66fd 100644
--- a/runtime-testsuite/processors/pom.xml
+++ b/runtime-testsuite/processors/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.antlr</groupId>
 		<artifactId>antlr4-master</artifactId>
-		<version>4.8-2-SNAPSHOT</version>
+		<version>4.9-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>antlr4-runtime-test-annotation-processors</artifactId>
diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index ce1e2063a..08ae511a5 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.antlr</groupId>
 		<artifactId>antlr4-master</artifactId>
-		<version>4.8-2-SNAPSHOT</version>
+		<version>4.9-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>antlr4-runtime</artifactId>
diff --git a/runtime/PHP b/runtime/PHP
index 62fd3c3b5..6c0287e9a 160000
--- a/runtime/PHP
+++ b/runtime/PHP
@@ -1 +1 @@
-Subproject commit 62fd3c3b5aa48efe977775b193ac6cb324dafe2d
+Subproject commit 6c0287e9a5be50d71578436aed99972ed23f73e0
diff --git a/tool-testsuite/pom.xml b/tool-testsuite/pom.xml
index 0b8bf4d66..faecc7421 100644
--- a/tool-testsuite/pom.xml
+++ b/tool-testsuite/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.antlr</groupId>
     <artifactId>antlr4-master</artifactId>
-    <version>4.8-2-SNAPSHOT</version>
+    <version>4.9-SNAPSHOT</version>
   </parent>
   <artifactId>antlr4-tool-testsuite</artifactId>
   <name>ANTLR 4 Tool Tests</name>
diff --git a/tool/pom.xml b/tool/pom.xml
index 11edf014d..359ac1215 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.antlr</groupId>
 		<artifactId>antlr4-master</artifactId>
-		<version>4.8-2-SNAPSHOT</version>
+		<version>4.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>antlr4</artifactId>
 	<name>ANTLR 4 Tool</name>