diff --git a/.ci/helper_luarocks.sh b/.ci/helper_luarocks.sh
index 374be978f..846780bee 100755
--- a/.ci/helper_luarocks.sh
+++ b/.ci/helper_luarocks.sh
@@ -11,7 +11,7 @@ echo "wrap_bin_scripts = false" >>"$HOME/.luarocks/config.lua"
 travis_retry luarocks --local install luafilesystem
 # for verbose_print module
 travis_retry luarocks --local install ansicolors
-travis_retry luarocks --local install busted 2.0.rc12-1
+travis_retry luarocks --local install busted 2.0.rc13-0
 #- mv -f $HOME/.luarocks/bin/busted_bootstrap $HOME/.luarocks/bin/busted
 # Apply junit testcase time fix. This can be removed once there is a busted 2.0.rc13 or final
 # See https://github.com/Olivine-Labs/busted/commit/830f175c57ca3f9e79f95b8c4eaacf58252453d7
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 771ee6adc..bdade3505 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: frenzie/koappimage:0.1.4
+      - image: koreader/koappimage:0.1.5
         environment:
           EMULATE_READER: 1
           # this is for shellcheck 0.4.5 and lower; can be removed for 0.4.6
diff --git a/base b/base
index 79fa7fc09..6e96572f0 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 79fa7fc093c597c3d0d17806c302f15d751b22a1
+Subproject commit 6e96572f0cac11553c54b35d9aef3ccb1256a966