diff --git a/docs/release/build/uprel.bat b/docs/release/build/uprel.bat
index dd81e7205c3..0c899781856 100644
--- a/docs/release/build/uprel.bat
+++ b/docs/release/build/uprel.bat
@@ -1,6 +1,6 @@
 \goto end
 git fetch upstream
-git merge upstream/release0267
+git merge upstream/release0268
 git checkout master
 :end
 pause
diff --git a/docs/release/src/devices/bus/nes/nes_ines.hxx b/docs/release/src/devices/bus/nes/nes_ines.hxx
index 82f14181f8c..6779b0ed57d 100644
--- a/docs/release/src/devices/bus/nes/nes_ines.hxx
+++ b/docs/release/src/devices/bus/nes/nes_ines.hxx
@@ -575,7 +575,7 @@ void ines_mapr_setup( int mapper, int *pcb_id )
 	const nes_mmc *mmc = nes_mapper_lookup(mapper);
 	if (mmc == nullptr)
 	{
-		osd_printf_error("Unimplemented Mapper %d\n", mapper);  // MESSUI - do not kill emulator please
+		osd_printf_error("Unimplemented Mapper: %d\n", mapper);  // MESSUI - do not kill emulator please
 		return;
 	}
 
diff --git a/docs/release/src/devices/imagedev/floppy.cpp b/docs/release/src/devices/imagedev/floppy.cpp
index 85ded0d934b..822dcb496ae 100644
--- a/docs/release/src/devices/imagedev/floppy.cpp
+++ b/docs/release/src/devices/imagedev/floppy.cpp
@@ -1140,12 +1140,12 @@ void floppy_image_device::cache_clear()
 void floppy_image_device::cache_fill(const attotime &when)
 {
 	std::vector<uint32_t> &buf = m_image->get_buffer(m_cyl, m_ss, m_subcyl);
-	uint32_t cells = buf.size();
+	uint32_t const cells = buf.size();
 	if(cells <= 1) {
 		m_cache_start_time = attotime::zero;
 		m_cache_end_time = attotime::never;
 		m_cache_index = 0;
-		m_cache_entry = cells == 1 ? buf[0] : floppy_image::MG_N;
+		m_cache_entry = (cells == 1) ? buf[0] : floppy_image::MG_N;
 		cache_weakness_setup();
 		return;
 	}
@@ -1153,25 +1153,23 @@ void floppy_image_device::cache_fill(const attotime &when)
 	attotime base;
 	uint32_t position = find_position(base, when);
 
-	auto it = std::upper_bound(
-		buf.begin(), buf.end(), position,
-		[](uint32_t a, uint32_t b) {
-			return a < (b & floppy_image::TIME_MASK);
-		}
-	);
-
-	int index = int(it - buf.begin()) - 1;
+	auto const it = std::upper_bound(
+			buf.begin(), buf.end(), position,
+			[] (uint32_t a, uint32_t b) { return a < (b & floppy_image::TIME_MASK); });
 
-	if(index == -1) {
+	int index;
+	if(buf.begin() == it) {
 		base -= m_rev_time;
 		index = buf.size() - 1;
+	} else {
+		index = int(it - buf.begin()) - 1;
 	}
 
 	for(;;) {
 		cache_fill_index(buf, index, base);
 		if(m_cache_end_time > when) {
 			cache_weakness_setup();
-			return;
+			break;
 		}
 	}
 }
diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp
index 4c3107726c9..2eec23e33e1 100644
--- a/docs/release/src/version.cpp
+++ b/docs/release/src/version.cpp
@@ -8,7 +8,7 @@
 
 ***************************************************************************/
 
-#define BARE_BUILD_VERSION "0.267.0"
+#define BARE_BUILD_VERSION "0.268.0"
 
 extern const char bare_build_version[];
 extern const char build_version[];
diff --git a/makefile b/makefile
index 1b43f4a185e..a237d2267f5 100644
--- a/makefile
+++ b/makefile
@@ -1578,7 +1578,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.267.x"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.268.0"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
 	@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.267.x" > $@
+	@echo #define BARE_BUILD_VERSION "0.268.0" > $@
 	@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char bare_vcs_revision[]; >> $@
diff --git a/src/version.cpp b/src/version.cpp
index d66f770211a..2eec23e33e1 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -8,7 +8,7 @@
 
 ***************************************************************************/
 
-#define BARE_BUILD_VERSION "0.267.x"
+#define BARE_BUILD_VERSION "0.268.0"
 
 extern const char bare_build_version[];
 extern const char build_version[];