diff --git a/board/bananapi/kernel.config b/board/bananapi/kernel.config
index 0282da9f11..aece551bab 100644
--- a/board/bananapi/kernel.config
+++ b/board/bananapi/kernel.config
@@ -29,7 +29,6 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-meye"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/board/common/overlay/etc/watch.conf b/board/common/overlay/etc/watch.conf
index 34d46b9089..94fc0a6634 100644
--- a/board/common/overlay/etc/watch.conf
+++ b/board/common/overlay/etc/watch.conf
@@ -12,4 +12,3 @@ netwatch_interval=20
 
 #meyewatch_disable="true"
 meyewatch_timeout=120
-
diff --git a/build.sh b/build.sh
index f7e3963b1d..ce552f0348 100755
--- a/build.sh
+++ b/build.sh
@@ -12,6 +12,7 @@ target=${*:2}
 cd $(dirname $0)
 basedir=$(pwd)
 osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name)
+osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version)
 gzip=$(which pigz || which gzip)
 
 if [ "$board" == "all" ]; then
@@ -44,10 +45,9 @@ if [ "$target" == "mkimage" ]; then
 elif [ "$target" == "mkrelease" ]; then
     $boarddir/mkimage.sh
     cp $outputdir/images/$osname-$board.img $basedir
-    date=$(date +%Y%m%d)
-    mv $basedir/$osname-$board.img  $basedir/$osname-$board-$date.img
-    rm -f $basedir/$osname-$board-$date.img.gz
-    $gzip $basedir/$osname-$board-$date.img
+    mv $basedir/$osname-$board.img  $basedir/$osname-$board-$osversion.img
+    rm -f $basedir/$osname-$board-$osversion.img.gz
+    $gzip $basedir/$osname-$board-$osversion.img
 elif [ -n "$target" ]; then
     make O=$outputdir $target
 else
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index f6f4ab5b61..3f89ed2c7a 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -6,6 +6,7 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi"
 BR2_OPTIMIZE_2=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_GCC_VERSION_4_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_SKELETON_CUSTOM=y
diff --git a/package/Config.in b/package/Config.in
index 73c3aa13a5..edc6816fd8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -449,6 +449,7 @@ endmenu
 	source "package/read-edid/Config.in"
 	source "package/rfkill/Config.in"
 	source "package/rng-tools/Config.in"
+        source "package/rpi-armmem/Config.in"
 	source "package/rpi-userland/Config.in"
 	source "package/rs485conf/Config.in"
 	source "package/rtl8188eu/Config.in"
diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in
new file mode 100644
index 0000000000..acfd0f3b0d
--- /dev/null
+++ b/package/python-functools32/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_FUNCTOOLS32
+	bool "python-functools32"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy.
+
+	  https://github.com/MiCHiLU/python-functools32
diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk
new file mode 100644
index 0000000000..1590c51238
--- /dev/null
+++ b/package/python-functools32/python-functools32.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-functools32
+#
+################################################################################
+
+PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2
+PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz
+PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db
+PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils
+
+$(eval $(python-package))
+