Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	simpleimage/make_rootfs.sh

Author: ayufan

package/root/usr/local/sbin/install_i3_desktop.sh

@@ -41,7 +41,7 @@ if [ ! -d /usr/share/slim/themes/pine64 ]; then
 	cp -ra /usr/share/slim/themes/default /usr/share/slim/themes/pine64
 	wget -O /usr/share/slim/themes/pine64/background.png \
 		https://github.com/longsleep/build-pine64-image/raw/master/bootlogo/bootlogo-pine64-1366x768.png
-	sed s/^current_theme(.*)/current_theme pine64/g /etc/slim.conf
+	sed -i "s/^current_theme(.*)/current_theme pine64/g" /etc/slim.conf
 fi
 
 echo "Done - you should reboot now."