Merge branch 'maint'

Conflicts:
	lib/hipe/cerl/erl_bif_types.erl
	lib/stdlib/doc/src/binary.xml

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/jinterface/test/nc_SUITE_data/echo_server.java b/lib/jinterface/test/nc_SUITE_data/echo_server.java
index 0550e4beb1..5ecb5b72a7 100644
--- a/lib/jinterface/test/nc_SUITE_data/echo_server.java
+++ b/lib/jinterface/test/nc_SUITE_data/echo_server.java
@@ -202,6 +202,12 @@ public class echo_server {
 		final OtpErlangAtom o = new OtpErlangAtom(s.stringValue()
 			.substring(3));
 		return o;
+	    } else if (atomValue.equals("codepointBug")
+		    && i instanceof OtpErlangString) {
+		final OtpErlangString s = (OtpErlangString) i;
+		final String ss = s.stringValue().substring(3, 6);
+		final int[] cps = OtpErlangString.stringToCodePoints(ss);
+		return s;
 	    } else if (atomValue.equals("utf8")) {
 		if (i instanceof OtpErlangString) {
 		    final OtpErlangString s = (OtpErlangString) i;