diff --git a/manifest b/manifest
index 9af4d76b72..627ec4af45 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sa\stable\sis\son\sthe\srhs\sof\sa\sLEFT\sJOIN,\sinclude\sonly\sterms\sfrom\sthe\sjoins\sON(...)\sclause\sin\sthe\scursor-hint\spassed\svia\sOP_CursorHint.
-D 2016-06-17T14:33:32.727
+C Fix\sa\stypo\sin\sthe\scursorhint2.test\sscript.
+D 2016-06-17T14:47:37.300
 F Makefile.in f3f7d2060ce03af4584e711ef3a626ef0b1d6340
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423
@@ -617,7 +617,7 @@ F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
 F test/csv01.test 0929a9ce47021519512be92861f29e32d2538e5f
 F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
-F test/cursorhint2.test 532fdc678653f73e30770b59af0a47f9af0124ee
+F test/cursorhint2.test c4c49b4b34eabc3d61ff111d477113f5c901d7fa
 F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
 F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
@@ -1502,10 +1502,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 0b1579caf06a2c42433b8bc9dc28c9ad381aa07c
-R 2d1831333befb414525bf922ba35c127
-T *branch * cursor-hints
-T *sym-cursor-hints *
-T -sym-trunk *
+P 2a2346b04235c6d0b7a8e64c92ee31018285c29f
+R f8aa0cb7edf61b31b26c82b3f234b1ab
 U dan
-Z b45fbbd37d7e68d5f1357e6143b6a1f1
+Z ac8df9edec12a135c248b7ca97a78998
diff --git a/manifest.uuid b/manifest.uuid
index 4e6e68e3f9..bbdc3674bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a2346b04235c6d0b7a8e64c92ee31018285c29f
\ No newline at end of file
+c1a5a57cf10dca91082963dcbd3e3ffebc3707ef
\ No newline at end of file
diff --git a/test/cursorhint2.test b/test/cursorhint2.test
index 3909678802..3a79596036 100644
--- a/test/cursorhint2.test
+++ b/test/cursorhint2.test
@@ -55,43 +55,43 @@ do_execsql_test 1.0 {
   CREATE TABLE t3(e, f);
 }
 
-do_extract_hints_test $tn.1.1 {
+do_extract_hints_test 1.1 {
   SELECT * FROM t1 WHERE a=1;
 } {
   t1 EQ(c0,1)
 }
 
-do_extract_hints_test $tn.1.2 {
+do_extract_hints_test 1.2 {
   SELECT * FROM t1 CROSS JOIN t2 ON (a=c) WHERE d IS NULL;
 } {
   t2 {AND(ISNULL(c1),EQ(r[1],c0))}
 }
 
-do_extract_hints_test $tn.1.3 {
+do_extract_hints_test 1.3 {
   SELECT * FROM t1 LEFT JOIN t2 ON (a=c) WHERE d IS NULL;
 } {
   t2 {EQ(r[2],c0)}
 }
 
-do_extract_hints_test $tn.1.4 {
+do_extract_hints_test 1.4 {
   SELECT * FROM t1 LEFT JOIN t2 ON (a=c AND a=10) WHERE d IS NULL;
 } {
   t2 {AND(EQ(r[2],c0),EQ(r[3],10))}
 }
 
-do_extract_hints_test $tn.1.5 {
+do_extract_hints_test 1.5 {
   SELECT * FROM t1 CROSS JOIN t2 ON (a=c AND a=10) WHERE d IS NULL;
 } {
   t1 EQ(c0,10) t2 {AND(ISNULL(c1),EQ(r[3],c0))}
 }
 
-do_extract_hints_test $tn.1.6 {
+do_extract_hints_test 1.6 {
   SELECT * FROM t1 LEFT JOIN t2 ON (a=c) LEFT JOIN t3 ON (d=f);
 } {
   t2 {EQ(r[2],c0)} t3 {EQ(r[6],c1)}
 }
 
-do_extract_hints_test $tn.1.6 {
+do_extract_hints_test 1.6 {
   SELECT * FROM t1 LEFT JOIN t2 ON (a=c AND d=e) LEFT JOIN t3 ON (d=f);
 } {
   t2 {EQ(r[2],c0)} t3 {EQ(r[6],c1)}