diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionNumber.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionNumber.java
index 699b4ca979ee77ab0007b708e6c242059c691b81..7f3cc835154e1a2accd58dfa0cc79cf677fc79c0 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionNumber.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RVersionNumber.java
@@ -33,9 +33,9 @@ package com.oracle.truffle.r.runtime;
 public class RVersionNumber {
     public static final String MAJOR = "3";
     public static final String MINOR = "3";
-    public static final String PATCH = "0";
+    public static final String PATCH = "1";
 
-    public static final int R_VERSION = (3 << 16) + (3 << 8) + 0;
+    public static final int R_VERSION = (3 << 16) + (3 << 8) + 1;
 
     public static final String MAJOR_MINOR = MAJOR + "." + MINOR;
     public static final String MINOR_PATCH = MINOR + "." + PATCH;
@@ -43,8 +43,8 @@ public class RVersionNumber {
     public static final String R_HYPHEN_FULL = "R-" + FULL;
 
     public static final String RELEASE_YEAR = "2016";
-    public static final String RELEASE_MONTH = "05";
-    public static final String RELEASE_DAY = "03";
+    public static final String RELEASE_MONTH = "06";
+    public static final String RELEASE_DAY = "21";
 
     public static final String VERSION_STRING = "FastR version " + FULL + " (" + RELEASE_YEAR + "-" + RELEASE_MONTH + "-" + RELEASE_DAY + ")";
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index a3a23359af00fb0dcd84ddb87a0405215712b9c8..872652954e2863f1c016e2ffffbaf8ebebd4cfa8 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -158,7 +158,7 @@ Class: numeric
 #{ gen<-function(object) 0; setGeneric("gen"); res<-print(gen); removeGeneric("gen"); res }
 function (object)
 standardGeneric("gen")
-<environment: 0x7fcda468e070>
+<environment: 0x7fd033a4a478>
 attr(,"generic")
 [1] "gen"
 attr(,"generic")attr(,"package")
@@ -192,7 +192,7 @@ standardGeneric for "gen" defined from package ".GlobalEnv"
 
 function (object)
 standardGeneric("gen")
-<environment: 0x7fcda468e070>
+<environment: 0x7fd033a4a478>
 Methods may be defined for arguments: object
 Use  showMethods("gen")  for currently available ones.
 
@@ -219,7 +219,7 @@ Creating a generic function for ‘diag<-’ from package ‘base’ in the glob
 ##com.oracle.truffle.r.test.S4.TestS4.testMethods#Ignored.OutputFormatting#
 #{ setGeneric("gen", function(object) standardGeneric("gen")); res<-print(gen); removeGeneric("gen"); res }
 function(object) standardGeneric("gen")
-<environment: 0x7fe78d997478>
+<environment: 0x7f89ecc1b028>
 attr(,"generic")
 [1] "gen"
 attr(,"generic")attr(,"package")
@@ -246,7 +246,7 @@ standardGeneric for "gen" defined from package ".GlobalEnv"
 
 function (object)
 standardGeneric("gen")
-<environment: 0x7fe78d997478>
+<environment: 0x7f89ecc1b028>
 Methods may be defined for arguments: object
 Use  showMethods("gen")  for currently available ones.
 
@@ -10225,7 +10225,7 @@ x y
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_c.testCombine#Output.ContainsReferences#
 #{ e1 <- new.env(); c(e1, 3) }
 [[1]]
-<environment: 0x7ff8ec460578>
+<environment: 0x7f926afe0180>
 
 [[2]]
 [1] 3
@@ -10234,10 +10234,10 @@ x y
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_c.testCombine#Output.ContainsReferences#
 #{ e1 <- new.env(); e2 <- new.env(); c(e1, e2) }
 [[1]]
-<environment: 0x7fc582b520d8>
+<environment: 0x7fbbab815ae0>
 
 [[2]]
-<environment: 0x7fc582b51ce8>
+<environment: 0x7fbbab816698>
 
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_c.testCombine#
@@ -15497,7 +15497,7 @@ character(0)
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_date.testDate#Ignored.Unknown#
 #{date()}
-[1] "Mon Oct 31 16:39:11 2016"
+[1] "Mon Oct 31 22:14:56 2016"
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_delayedAssign.testDelayedAssign#
 #{ delayedAssign("x", a+b); a <- 1 ; b <- 3 ; x }
@@ -20781,7 +20781,7 @@ description       class        mode        text      opened    can read
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_getNamespaceVersion.testgetNamespaceVersion1#
 #argv <- structure(list(ns = 'stats'), .Names = 'ns');do.call('getNamespaceVersion', argv)
 version
-"3.3.0"
+"3.3.1"
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_getRestart.testgetRestart1#
 #argv <- list(2L); .Internal(.getRestart(argv[[1]]))
@@ -28537,8 +28537,8 @@ character(0)
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_listfiles.testlistfiles3#Ignored.Unknown#
 #argv <- list('.', '^CITATION.*', FALSE, FALSE, TRUE, FALSE, FALSE, FALSE); .Internal(list.files(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]], argv[[8]]))
-[1] "com.oracle.truffle.r.native/gnur/R-3.3.0/library/base/CITATION"
-[2] "com.oracle.truffle.r.native/gnur/R-3.3.0/src/library/base/inst/CITATION"
+[1] "com.oracle.truffle.r.native/gnur/R-3.3.1/library/base/CITATION"
+[2] "com.oracle.truffle.r.native/gnur/R-3.3.1/src/library/base/inst/CITATION"
 [3] "library/base/CITATION"
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_listfiles.testlistfiles4#
@@ -32610,20 +32610,20 @@ Error in argv[[4]] : subscript out of bounds
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_newenv.testnewenv#Output.ContainsReferences#
 #e <- new.env(); e; parent.env(new.env(TRUE, e))
-<environment: 0x7ff4b477e428>
-<environment: 0x7ff4b477e428>
+<environment: 0x7fb18c6c5e30>
+<environment: 0x7fb18c6c5e30>
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_newenv.testnewenv#Output.ContainsReferences#
 #new.env()
-<environment: 0x7fa1533dc508>
+<environment: 0x7ff8dc57e710>
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_newenv.testnewenv#Output.ContainsReferences#
 #new.env(1,,2)
-<environment: 0x7fb075347310>
+<environment: 0x7fe42e9ef318>
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_newenv.testnewenv#Output.ContainsReferences#
 #new.env(logical(),new.env(),1000)
-<environment: 0x7ffa5945b150>
+<environment: 0x7ff3714fcd58>
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_newenv.testnewenv#Output.ContainsReferences#
 #parent.env(new.env())
@@ -37990,7 +37990,7 @@ Error in parent.env(c(1, 2, 3)) : argument is not an environment
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_parentenvassign.testParentEnv#Output.ContainsReferences#
 #e <- new.env(); e2 <- new.env(); parent.env(e) <- e2; parent.env(e)
-<environment: 0x7fbeedbb8940>
+<environment: 0x7fc92a598f48>
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_parentenvassign.testParentEnv#Output.IgnoreErrorContext#
 #e <- new.env(); parent.env(e) <- 44
@@ -44434,59 +44434,59 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote("bar"), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 10 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 10 00 00 00 01 00 04 00
 [26] 09 00 00 00 03 62 61 72
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote('asdf'), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 10 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 10 00 00 00 01 00 04 00
 [26] 09 00 00 00 04 61 73 64 66
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote('baz'), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 10 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 10 00 00 00 01 00 04 00
 [26] 09 00 00 00 03 62 61 7a
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#Ignored.ImplementationError#
 #options(keep.source=FALSE); serialize(quote((a %asdf% b)), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 01 28 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00
 [51] 06 25 61 73 64 66 25 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00
 [76] 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#Ignored.ImplementationError#
 #options(keep.source=FALSE); serialize(quote((a+b)), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 01 28 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00
 [51] 01 2b 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00 00 00 02 00 00
 [76] 00 01 00 04 00 09 00 00 00 01 62 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(111+11), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 01 2b 00 00 00 02 00 00 00 0e 00 00 00 01 40 5b c0 00 00 00 00
 [51] 00 00 00 00 02 00 00 00 0e 00 00 00 01 40 26 00 00 00 00 00 00 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(111+8i), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 01 2b 00 00 00 02 00 00 00 0e 00 00 00 01 40 5b c0 00 00 00 00
 [51] 00 00 00 00 02 00 00 00 0f 00 00 00 01 00 00 00 00 00 00 00 00 40 20 00 00
 [76] 00 00 00 00 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(111L), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 0d 00 00 00 01 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 0d 00 00 00 01 00 00 00
 [26] 6f
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(FALSE), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 0a 00 00 00 01 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 0a 00 00 00 01 00 00 00
 [26] 00
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(NA_character_ + NA_complex_ + NA_integer_ + NA_real_), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 01 2b 00 00 00 02 00 00 00 06 00 00 01 ff 00 00 00 02 00 00 00
  [51] 06 00 00 01 ff 00 00 00 02 00 00 00 10 00 00 00 01 00 00 00 09 ff ff ff ff
  [76] 00 00 00 02 00 00 00 0f 00 00 00 01 7f f0 00 00 00 00 07 a2 7f f0 00 00 00
@@ -44496,32 +44496,32 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(NA_character_), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 10 00 00 00 01 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 10 00 00 00 01 00 00 00
 [26] 09 ff ff ff ff
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(NA_complex_), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 0f 00 00 00 01 7f f0 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 0f 00 00 00 01 7f f0 00
 [26] 00 00 00 07 a2 7f f0 00 00 00 00 07 a2
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(NA_integer_), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 0d 00 00 00 01 80 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 0d 00 00 00 01 80 00 00
 [26] 00
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(NA_real_), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 0e 00 00 00 01 7f f0 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 0e 00 00 00 01 7f f0 00
 [26] 00 00 00 07 a2
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(TRUE), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 0a 00 00 00 01 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 0a 00 00 00 01 00 00 00
 [26] 01
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(a(b(c(d(function (e, ...) { f(g)$h.i}))))), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 01 61 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00
  [51] 01 62 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 63 00 00
  [76] 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 64 00 00 00 02 00 00
@@ -44537,27 +44537,27 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(a+b), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 01 2b 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00 00
 [51] 00 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(f(g)$h.i), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 01 24 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00
 [51] 01 66 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 67 00 00 00 fe 00 00
 [76] 00 02 00 00 00 01 00 04 00 09 00 00 00 03 68 2e 69 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(foo(a,b,c)), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 03 66 6f 6f 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61
 [51] 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 02 00 00 00 01
 [76] 00 04 00 09 00 00 00 01 63 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function() new("foo", x)), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 00 fe 00 00 00 02
  [51] 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 03 6e 65 77 00 00 00 02 00 00
  [76] 00 10 00 00 00 01 00 04 00 09 00 00 00 03 66 6f 6f 00 00 00 02 00 00 00 01
@@ -44565,7 +44565,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#Ignored.ImplementationError#
 #options(keep.source=FALSE); serialize(quote(function(x) { `+`(`(`("BAR"), x) }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 00 fe 00 00 00 02 00 00 00 06
  [76] 00 00 00 01 00 04 00 09 00 00 00 01 7b 00 00 00 02 00 00 00 06 00 00 00 01
@@ -44576,7 +44576,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x) { new("BAR", x) }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 00 fe 00 00 00 02 00 00 00 06
  [76] 00 00 00 01 00 04 00 09 00 00 00 01 7b 00 00 00 02 00 00 00 06 00 00 00 01
@@ -44586,7 +44586,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x, ...) { new("BAR", x) }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 04 02 00 00 00 01 00 04 00 09
  [76] 00 00 00 03 2e 2e 2e 00 00 00 fb 00 00 00 fe 00 00 00 02 00 00 00 06 00 00
@@ -44597,7 +44597,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x,y) { TRUE }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 04 02 00 00 00 01 00 04 00 09
  [76] 00 00 00 01 79 00 00 00 fb 00 00 00 fe 00 00 00 02 00 00 00 06 00 00 00 01
@@ -44606,7 +44606,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x,y) { new("BAR", x) }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 04 02 00 00 00 01 00 04 00 09
  [76] 00 00 00 01 79 00 00 00 fb 00 00 00 fe 00 00 00 02 00 00 00 06 00 00 00 01
@@ -44617,7 +44617,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x,y,...) { 1 }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 04 02 00 00 00 01 00 04 00 09
  [76] 00 00 00 01 79 00 00 00 fb 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 03
@@ -44627,7 +44627,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x,y=1,...) { NA }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 fb 00 00 04 02 00 00 00 01 00 04 00 09
  [76] 00 00 00 01 79 00 00 00 0e 00 00 00 01 3f f0 00 00 00 00 00 00 00 00 04 02
@@ -44638,7 +44638,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x={1 + a},y,...) { !!NA }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01
  [76] 7b 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 2b 00 00 00
@@ -44652,7 +44652,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x={1 + a},y,...) { !1+5i }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01
  [76] 7b 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 2b 00 00 00
@@ -44668,7 +44668,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x={1 + a},y,...) { NA }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01
  [76] 7b 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 2b 00 00 00
@@ -44681,7 +44681,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(function(x={1 + a},y=c(1,2,3),z="foo",...) { !1+5i }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 08 66 75 6e 63 74 69 6f 6e 00 00 00 02 00 00 04 02 00 00 00 01
  [51] 00 04 00 09 00 00 00 01 78 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01
  [76] 7b 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 2b 00 00 00
@@ -44701,7 +44701,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(if (a * 2 < 199) b + foo(x,y,foo=z+1,bar=)), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 02 69 66 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00
  [51] 00 01 3c 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 2a 00
  [76] 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00 00 00 02 00 00 00 0e 00
@@ -44718,14 +44718,14 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(if (a) b else c), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 02 69 66 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00
 [51] 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 02 00 00 00 01 00
 [76] 04 00 09 00 00 00 01 63 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(if (a) {b} else {c}), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 02 69 66 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00
  [51] 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 01 7b 00 00 00 02 00
  [76] 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 fe 00 00 00 02 00 00 00 06 00
@@ -44734,7 +44734,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(if ({a}) {b} else {c}), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 02 69 66 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00
  [51] 00 01 7b 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00 00 00 fe 00
  [76] 00 00 02 00 00 00 06 00 00 02 ff 00 00 00 02 00 00 00 01 00 04 00 09 00 00
@@ -44743,7 +44743,7 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(repeat {b; if (c) next else break}), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 06 72 65 70 65 61 74 00 00 00 02 00 00 00 06 00 00 00 01 00 04
  [51] 00 09 00 00 00 01 7b 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00
  [76] 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00 02 69 66 00 00 00 02
@@ -44754,18 +44754,18 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(while (a) b), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
 [26] 09 00 00 00 05 77 68 69 6c 65 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00
 [51] 01 61 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote(x), connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 01 00 04 00 09 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 01 00 04 00 09 00 00 00
 [26] 01 78
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); serialize(quote({ foo(a,b,c) }), connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 06 00 00 00 01 00 04 00
  [26] 09 00 00 00 01 7b 00 00 00 02 00 00 00 06 00 00 00 01 00 04 00 09 00 00 00
  [51] 03 66 6f 6f 00 00 00 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00 00 00 02
  [76] 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 02 00 00 00 01 00 04 00 09
@@ -44773,60 +44773,60 @@ Error in seq.int(argv[[1]], argv[[2]], argv[[3]]) :
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- defaultPrototype(); serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 01 00 19
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 01 00 19
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- list(enclos = new.env(hash=FALSE)); serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 02 13 00 00 00 01 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 02 13 00 00 00 01 00 00 00
 [26] 04 00 00 00 00 00 00 00 fd 00 00 00 fe 00 00 00 fe 00 00 00 fe 00 00 04 02
 [51] 00 00 00 01 00 04 00 09 00 00 00 05 6e 61 6d 65 73 00 00 00 10 00 00 00 01
 [76] 00 04 00 09 00 00 00 06 65 6e 63 6c 6f 73 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 00 fe 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); val$a <- 'foo'; serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 61 00 00 00 10 00 00 00
 [51] 01 00 04 00 09 00 00 00 03 66 6f 6f 00 00 00 fe 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); val$b <- 123; serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 62 00 00 00 0e 00 00 00
 [51] 01 40 5e c0 00 00 00 00 00 00 00 00 fe 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); val$c <- 1233L; serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 63 00 00 00 0d 00 00 00
 [51] 01 00 00 04 d1 00 00 00 fe 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); val$d <- TRUE; serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 64 00 00 00 0a 00 00 00
 [51] 01 00 00 00 01 00 00 00 fe 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); val$e <- 5+9i; serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 65 00 00 00 0f 00 00 00
 [51] 01 40 14 00 00 00 00 00 00 40 22 00 00 00 00 00 00 00 00 00 fe 00 00 00 fe
 [76] 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #options(keep.source=FALSE); val <- new.env(hash=FALSE); val$f <- NA; serialize(val, connection=NULL)
- [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
+ [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 00 00 04 00 00 00 00 00 00 00
 [26] fd 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 66 00 00 00 0a 00 00 00
 [51] 01 80 00 00 00 00 00 00 fe 00 00 00 fe 00 00 00 fe
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_serialize.testserialize#
 #setClass('foo', slots = c(x='numeric', y='numeric')); t1 <- new('foo', x=4, y=c(77,88)); options(keep.source=FALSE); serialize(t1, connection=NULL)
-  [1] 58 0a 00 00 00 02 00 03 03 00 00 02 03 00 00 01 03 19 00 00 04 02 00 00 00
+  [1] 58 0a 00 00 00 02 00 03 03 01 00 02 03 00 00 01 03 19 00 00 04 02 00 00 00
  [26] 01 00 04 00 09 00 00 00 01 78 00 00 00 0e 00 00 00 01 40 10 00 00 00 00 00
  [51] 00 00 00 04 02 00 00 00 01 00 04 00 09 00 00 00 01 79 00 00 00 0e 00 00 00
  [76] 02 40 53 40 00 00 00 00 00 40 56 00 00 00 00 00 00 00 00 04 02 00 00 00 01
@@ -51173,25 +51173,25 @@ Error in tracemem(NULL) : cannot trace NULL
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_tracemem.list#Output.ContainsReferences#
 #v <- list(1,10,100); tracemem(v); x <- v; x[[1]]<-42;
-[1] "<0x7ffd5f08d840>"
-tracemem[0x7ffd5f08d840 -> 0x7ffd5f08d6d8]:
+[1] "<0x7ffa23d66a40>"
+tracemem[0x7ffa23d66a40 -> 0x7ffa23d668d8]:
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_tracemem.retracemem#Output.ContainsReferences#
 #v <- c(1,10,100); tracemem(v); x <- v[-1]; retracemem(x, retracemem(v)); u <- x; u[[1]] <- 42;
-[1] "<0x7fd55488c040>"
-tracemem[<0x7fd55488c040> -> 0x7fd553b64a00]:
-tracemem[0x7fd553b64a00 -> 0x7fd553b64a38]:
+[1] "<0x7f877ed86040>"
+tracemem[<0x7f877ed86040> -> 0x7f877c8d7150]:
+tracemem[0x7f877c8d7150 -> 0x7f877c8d7188]:
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_tracemem.vectors#Output.ContainsReferences#
 #v <- c(1,10,100); tracemem(v); x <- v; y <- v; x[[1]]<-42; untracemem(v); y[[2]] <- 84
-[1] "<0x7fa04a92cc40>"
-tracemem[0x7fa04a92cc40 -> 0x7fa04a92ca90]:
+[1] "<0x7f893adfda40>"
+tracemem[0x7f893adfda40 -> 0x7f893adfd890]:
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_tracemem.vectors#Output.ContainsReferences#
 #v <- c(1,10,100); tracemem(v); x <- v; y <- v; x[[1]]<-42; y[[2]] <- 84
-[1] "<0x7fbe5923fe40>"
-tracemem[0x7fbe5923fe40 -> 0x7fbe5923fc90]:
-tracemem[0x7fbe5923fe40 -> 0x7fbe5923fc00]:
+[1] "<0x7f89f6d86c40>"
+tracemem[0x7f89f6d86c40 -> 0x7f89f6d86a90]:
+tracemem[0x7f89f6d86c40 -> 0x7f89f6d86a00]:
 
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_trigamma.testtrigamma1#Ignored.Unknown#
 #argv <- list(structure(c(9.16602362697115, 1.16602362697115, 3.16602362697115, 6.16602362697115, 6.16602362697115, 2.16602362697115, 8.16602362697115, 1.16602362697115, 7.16602362697115, 19.1660236269712, 2.16602362697115), .Names = c('1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11')));trigamma(argv[[1]]);
@@ -57260,7 +57260,7 @@ Error: attempt to apply non-function
 function (x, where = -1, envir = if (missing(frame)) as.environment(where) else sys.frame(frame),
     frame, mode = "any", inherits = TRUE)
 .Internal(exists(x, envir, mode, inherits))
-<bytecode: 0x7fb2ea9794a0>
+<bytecode: 0x7fe8c9979ae0>
 <environment: namespace:base>
 
 ##com.oracle.truffle.r.test.functions.TestFunctions.testFunctionPrinting#
@@ -100331,7 +100331,7 @@ Error in z[[list()]] <- 42 :
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testListIndex#Ignored.Unknown#Output.IgnoreErrorContext#
 #{ z<-1:4; z[[list()]]<-NULL }
 Error in z[[list()]] <- NULL :
-  attempt to select less than one element in OneIndex
+  more elements supplied than there are to replace
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testListIndex#Output.IgnoreErrorMessage#
 #{ z<-1:4; z[[list()]]<-integer() }
@@ -100347,8 +100347,7 @@ Error in z[[list(1)]] <- 42 : invalid subscript type 'list'
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testListIndex#Output.IgnoreErrorMessage#
 #{ z<-1:4; z[[list(1)]]<-NULL }
-Error in z[[list(1)]] <- NULL :
-  more elements supplied than there are to replace
+Error in z[[list(1)]] <- NULL : invalid subscript type 'list'
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testListIndex#Output.IgnoreErrorMessage#
 #{ z<-1:4; z[[list(1)]]<-integer() }
@@ -101945,7 +101944,7 @@ Error in b[[0]] <- NULL :
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1)]] <- NULL ; b }
 Error in b[[c(1)]] <- NULL :
-  incompatible types (from NULL to integer) in [[ assignment
+  more elements supplied than there are to replace
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorContext#
 #{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }
@@ -101991,7 +101990,7 @@ Error in b[[0]] <- NULL :
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ b<-as.list(3:5); dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }
 Error in b[[c(1, 2)]] <- NULL :
-  more elements supplied than there are to replace
+  incompatible types (from NULL to integer) in [[ assignment
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#
 #{ b<-as.list(3:5); dim(b) <- c(1,3) ; b[] <- NULL ; b }
@@ -102467,7 +102466,7 @@ NULL
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x <- c(1) ; x[[NA]] <- NULL ; x }
 Error in x[[NA]] <- NULL :
-  more elements supplied than there are to replace
+  attempt to select less than one element in integerOneIndex
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x <- c(1); x[[-4]] <- NULL }
@@ -102477,17 +102476,17 @@ Error in x[[-4]] <- NULL :
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x <- c(1,2) ; x[[NA]] <- NULL ; x }
 Error in x[[NA]] <- NULL :
-  attempt to select more than one element in integerOneIndex
+  more elements supplied than there are to replace
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x <- c(1,2,3) ; x[[NA]] <- NULL ; x }
 Error in x[[NA]] <- NULL :
-  attempt to select more than one element in integerOneIndex
+  more elements supplied than there are to replace
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x <- c(1,2,3); x[[-1]] <- NULL }
 Error in x[[-1]] <- NULL :
-  more elements supplied than there are to replace
+  attempt to select more than one element in integerOneIndex
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x <- integer() ; x[[NA]] <- NULL ; x }
@@ -103046,7 +103045,7 @@ In x[1] <- c(1, 1) :
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x<-1:4; x[[0]]<-NULL; x }
 Error in x[[0]] <- NULL :
-  attempt to select less than one element in integerOneIndex
+  more elements supplied than there are to replace
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x<-1:4; x[[1]]<-NULL; x }
@@ -103070,7 +103069,7 @@ Error in x[c(1, NA)] <- c(7, 42) :
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x<-1:8; dim(x)<-c(2,2,2); x[[-3, 1, 1]] }
 Error in x[[-3, 1, 1]] :
-  attempt to select more than one element in get1index <real>
+  attempt to select less than one element in get1index <real>
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#
 #{ x<-1; x[0]<-integer(); x }
@@ -103373,8 +103372,8 @@ Error in x[[1]] <- NULL :
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#Output.IgnoreErrorMessage#
 #{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-NULL }
-Error in x[[as.raw(1), 1]] <- NULL :
-  more elements supplied than there are to replace
+Error in `[[<-`(`*tmp*`, as.raw(1), 1, value = NULL) :
+  invalid subscript type 'raw'
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testMoreVectorsOther#
 #{ x<-c(5,10); names(x)<-c(101, 102); names(x)[1]<-42; x }
@@ -105897,7 +105896,8 @@ Error in `[<-`(`*tmp*`, as.raw(1), 1, value = integer(0)) :
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testRawIndex#Output.IgnoreErrorMessage#
 #{ x<-c(1,2,3,4); x[[as.raw(1)]]<-NULL }
-Error in x[[as.raw(1)]] <- NULL : invalid subscript type 'raw'
+Error in x[[as.raw(1)]] <- NULL :
+  more elements supplied than there are to replace
 
 ##com.oracle.truffle.r.test.library.base.TestSimpleVectors.testRawIndex#
 #{ x<-c(1,2,3,4); x[[as.raw(1)]]<-c(1) }
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index a54f65a4a94929156ec1f51d691179948f41a829..eb145f15c27e02aedfa50ffe523d45476ad36c99 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -60,7 +60,7 @@ def r_path():
 
 def r_version():
     # Could figure this out dynamically
-    return 'R-3.3.0'
+    return 'R-3.3.1'
 
 def get_default_jdk():
     if _mx_graal:
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index da713a08244b552f29416732cf7676b27770bb3f..63ef682bce091569d03d3224022cd192b0b5428a 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -60,9 +60,9 @@ suite = {
   # explicitly referenced in the Parser annotation processor.
   "libraries" : {
     "GNUR" : {
-        "path" : "libdownloads/R-3.3.0.tar.gz",
-        "urls" : ["http://cran.rstudio.com/src/base/R-3/R-3.3.0.tar.gz"],
-        "sha1" : "166a25a7996150c9c83cdafcc89bfcd81578a887",
+        "path" : "libdownloads/R-3.3.1.tar.gz",
+        "urls" : ["http://cran.rstudio.com/src/base/R-3/R-3.3.1.tar.gz"],
+        "sha1" : "df853188d3e2b1c2d32393016401c432a5192c4d",
         "resource" : "true"
     },