diff --git a/manifest b/manifest
index 8ae1efb7f5..dfe0273672 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\shandling\ssingle\srow\spartitions\sin\sthe\spercent_rank()\swindow\nfunction.
-D 2018-06-21T19:20:39.296
+C Merge\slatest\strunk\schanges.
+D 2018-06-22T17:57:10.143
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -584,7 +584,7 @@ F src/where.c 0bcbf9e191ca07f9ea2008aa80e70ded46bcdffd26560c83397da501f00aece6
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
 F src/wherecode.c 3317f2b083a66d3e65a03edf316ade4ccb0a99c9956273282ebb579b95d4ba96
 F src/whereexpr.c 19cf35cdd9bf6d5589d8a5c960d99259761136187a2319a6e14d11cf1abe14c2
-F src/window.c 358312db1cf5462a3bed074a82afa0b8f98e5d74677e40ab5d920023fab85634
+F src/window.c b4a22460e456bc87f9668414f1f0e48c3f1434dada5f247c34be03e613718199
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1626,7 +1626,7 @@ F test/window3.test 3c2c768e053453dd12176df0d420b4a3b2661bf1116d67c926b1a0083608
 F test/window4.tcl 1ac3c81a214fc70288dcd68d13e7be7559f864964ce5607cb0e5c790158fead2
 F test/window4.test c07c80aa042fce3ced0300f01c403b06f1b728822a82516ef0febca0fdea2d74
 F test/window5.test fbf14119adb71a2640ec876436c5cc0c304a72f863bff41673c413a2a194646b
-F test/windowfault.test a3f239a78557554140ccde491371e17d7b58380aafd796554fc9a43527af9dfc
+F test/windowfault.test 9ca8fb3b6247677224ecc9d359e5821f8a20852740b669afb8539afbb985b6be
 F test/with1.test 58475190cd8caaeebea8cfeb2a264ec97a0c492b8ffe9ad20cefbb23df462f96
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
 F test/with3.test 5e8ce2c585170bbbc0544e2a01a4941fa0be173ba5265e5c92eb588cd99a232d
@@ -1743,7 +1743,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f41b6b7317e2b5ac5721a3adff49f298ded29f9e0f887af98faeb0cb7e865ab6
-R aa86dcfdc887728898a48848c8a25c49
+P b84fbf16eac718c151731e2b2dcc73f2f2a144e3670f8566a30793f1e4e6a3ec
+R a94a75549a24c145ef6665f7c2007150
 U dan
-Z 0617679bb8a6150dd38744804d96b1d7
+Z a5d17fec782a1e4141228b568759e47a
diff --git a/manifest.uuid b/manifest.uuid
index 2ea3fc23ce..742e91bddb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b84fbf16eac718c151731e2b2dcc73f2f2a144e3670f8566a30793f1e4e6a3ec
\ No newline at end of file
+ebe65b2386a6132f4ef2cce6668a2da7db0798a70d2fba652882d5bccfd6672b
\ No newline at end of file
diff --git a/src/window.c b/src/window.c
index 42a7e6ace7..ff65d150e0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -345,9 +345,8 @@ static void ntileStepFunc(
 ){
   struct NtileCtx *p;
   assert( nArg==2 );
-  assert( sqlite3VdbeAssertAggContext(pCtx) );
   p = (struct NtileCtx*)sqlite3_aggregate_context(pCtx, sizeof(*p));
-  if( ALWAYS(p) ){
+  if( p ){
     if( p->nTotal==0 ){
       p->nParam = sqlite3_value_int64(apArg[0]);
       p->nTotal = sqlite3_value_int64(apArg[1]);
diff --git a/test/windowfault.test b/test/windowfault.test
index 4d960fb238..80668b19f6 100644
--- a/test/windowfault.test
+++ b/test/windowfault.test
@@ -60,6 +60,18 @@ do_faultsim_test 1.1 -faults oom-t* -prep {
   faultsim_test_result {0 {1 1 1 2 2 2 1 1 1}}
 }
 
+do_faultsim_test 1.2 -faults oom-t* -prep {
+  faultsim_restore_and_reopen
+} -body {
+  execsql {
+    SELECT ntile(105) 
+    OVER ( RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW ) 
+    FROM t1
+  }
+} -test {
+  faultsim_test_result {0 {1 2 3}}
+}
+
 do_faultsim_test 2 -start 1 -faults oom-* -prep {
   faultsim_restore_and_reopen
 } -body {