Based on the patch by Steven Watanabe. [SVN r54619]
@@ -1 +1 @@
-Subproject commit ae534d73424b93bc1f78bc88e50984bee404013c
+Subproject commit 8b63c146ea13bd6f21bdd5013b24a830e9ebd528