OS: Update supervisor 123

OS: Bump version 1.9
rpi: Update kernel & firmware 4.14.58 (#139 )
2018-08-03 23:02:04 +00:00 · 2018-08-03 12:32:07 +00:00 · 2018-08-03 12:31:33 +00:00 · 2018-08-03 12:31:14 +00:00 · 2018-08-03 12:30:59 +00:00 · 2018-08-03 12:30:41 +00:00
17 changed files with 62 additions and 27 deletions
--- a/Documentation/boards/raspberrypi.md
+++ b/Documentation/boards/raspberrypi.md
@@ -10,6 +10,10 @@ Supported Hardware:
 | Raspberry Pi 2 B | rpi2 |
 | Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |

+## Limitation 64bit
+
+The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
+
 ## Serial console

 For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1` into `config.txt`.
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -0,0 +1,7 @@
+
+# Kernel Version
+
+| Board | Version |
+|-------|---------|
+| Open Virtual Applicance | 4.14.59 |
+| Raspberry Pi | 4.14.58 |
--- a/Documentation/network.md
+++ b/Documentation/network.md
@@ -1,11 +1,10 @@
 # Network

-HassOS uses NetworkManager to control the host network. In future releases, you can set up the configuration using the API/UI.
-Currently only manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive as described in [Configuration][configuration-usb].
+HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive as described in [Configuration][configuration-usb].

 ## Configuration Examples

-You can look also into [Official Manual][keyfile] or there are a lot of examples accross internet. The system is read only, if you not want change the IP address every boot, you should set the uuid property with a generic [UUID4][uuid].
+You can also read the [Official Manual][keyfile] or there are a lot of examples accross internet. The system is read only, if you don't want the IP address to change every boot, you should set the uuid property with a generic [UUID4][uuid]. Inside the `network` folder create the file `my-network` and add the appropriate contents below:

 ### Default

@@ -46,11 +45,11 @@ id=hassos-network
 uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
 type=802-11-wireless

-[wifi]
+[802-11-wireless]
 mode=infrastructure
 ssid=MY_SSID

-[wifi-security]
+[802-11-wireless-security]
 auth-alg=open
 key-mgmt=wpa-psk
 psk=MY_WLAN_SECRED_KEY
--- a/buildroot-external/board/ova/kernel.config
+++ b/buildroot-external/board/ova/kernel.config
@@ -1 +1,17 @@
-CONFIG_EFI_STUB=y
+CONFIG_EFI_STUB=y
+
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_ACM=m
+
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_BLK=m
+
--- a/buildroot-external/board/raspberrypi/rpi3-64/uboot-boot.sh
+++ b/buildroot-external/board/raspberrypi/rpi3-64/uboot-boot.sh
@@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype

 # Preserve origin bootargs
 setenv bootargs_rpi
-fdt addr ${fdt_addr}
+setenv fdt_org ${fdt_addr}
+fdt addr ${fdt_org}
 fdt get value bootargs_rpi /chosen bootargs

 setenv bootargs
@@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
  fi
 done

+setenv fdt_addr
 if test -n "${bootargs}"; then
  saveenv
 else
@@ -48,7 +50,7 @@ fi
 echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
-booti ${kernel_addr_r} - ${fdt_addr}
+booti ${kernel_addr_r} - ${fdt_org}

 echo "Fails on boot"
 reset
--- a/buildroot-external/board/raspberrypi/uboot-boot.sh
+++ b/buildroot-external/board/raspberrypi/uboot-boot.sh
@@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype

 # Preserve origin bootargs
 setenv bootargs_rpi
-fdt addr ${fdt_addr}
+setenv fdt_org ${fdt_addr}
+fdt addr ${fdt_org}
 fdt get value bootargs_rpi /chosen bootargs

 setenv bootargs
@@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
  fi
 done

+setenv fdt_addr
 if test -n "${bootargs}"; then
  saveenv
 else
@@ -48,7 +50,7 @@ fi
 echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
-bootz ${kernel_addr_r} - ${fdt_addr}
+bootz ${kernel_addr_r} - ${fdt_org}

 echo "Fails on boot"
 reset
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/post-image.s
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.41"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.59"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -77,7 +77,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
--- a/buildroot-external/configs/rpi0_w_defconfig
+++ b/buildroot-external/configs/rpi0_w_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a06f9e522301dfacc1f382d72e6a9792d8350328"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -86,7 +86,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a06f9e522301dfacc1f382d72e6a9792d8350328"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -85,7 +85,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a06f9e522301dfacc1f382d72e6a9792d8350328"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -86,7 +86,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a06f9e522301dfacc1f382d72e6a9792d8350328"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -86,7 +86,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
--- a/buildroot-external/configs/rpi_defconfig
+++ b/buildroot-external/configs/rpi_defconfig
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a06f9e522301dfacc1f382d72e6a9792d8350328"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -85,7 +85,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
--- a/buildroot-external/info
+++ b/buildroot-external/info
@@ -1,5 +1,5 @@
 VERSION_MAJOR=1
-VERSION_BUILD=6
+VERSION_BUILD=9

 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
--- a/buildroot-external/misc/rauc-hook
+++ b/buildroot-external/misc/rauc-hook
@@ -20,4 +20,9 @@ if [ -L /var/lib/systemd/timesync ]; then
    rm -f /var/lib/systemd/timesync
 fi

+# u-boot first stage device tree
+if [ -e /usr/sbin/fw_setenv ]; then
+    fw_setenv fdt_addr
+fi
+
 exit 0
--- a/buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch
+++ b/buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch
@@ -16,7 +16,7 @@ index 4854deae03..3a9f21e877 100644
@@ -1,2 +1,2 @@
 # Locally computed
 -sha256 ea451834e20136d249661e0ed7d1fdfa309249d233a387f44dd6c3b746a454c6 rpi-firmware-36f991382326907419f64917624427e59fd8e4a0.tar.gz
-+sha256 25c04d9e5b0d9dfe3145784c983460b6e47f370c2082ced45392882d55932b8a rpi-firmware-418b77e24476a98aba4ee33942cc5321e6698ce4.tar.gz
+sha256 59c3b8a817c6e40f34ce7e0d2f1b3f84bbec70761f306ca373aa12a6c3edb6c7 rpi-firmware-bffe7ee6b276f23822883f3d7fd7b705d12c26b9.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index eab4c5d307..cb2e9d6cd8 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -26,7 +26,7 @@ index eab4c5d307..cb2e9d6cd8 100644
 ################################################################################
 
 -RPI_FIRMWARE_VERSION = 36f991382326907419f64917624427e59fd8e4a0
-+RPI_FIRMWARE_VERSION = 418b77e24476a98aba4ee33942cc5321e6698ce4
+RPI_FIRMWARE_VERSION = bffe7ee6b276f23822883f3d7fd7b705d12c26b9
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
--- a/buildroot/package/rpi-firmware/rpi-firmware.hash
+++ b/buildroot/package/rpi-firmware/rpi-firmware.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 25c04d9e5b0d9dfe3145784c983460b6e47f370c2082ced45392882d55932b8a rpi-firmware-418b77e24476a98aba4ee33942cc5321e6698ce4.tar.gz
+sha256 59c3b8a817c6e40f34ce7e0d2f1b3f84bbec70761f306ca373aa12a6c3edb6c7 rpi-firmware-bffe7ee6b276f23822883f3d7fd7b705d12c26b9.tar.gz
--- a/buildroot/package/rpi-firmware/rpi-firmware.mk
+++ b/buildroot/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-RPI_FIRMWARE_VERSION = 418b77e24476a98aba4ee33942cc5321e6698ce4
+RPI_FIRMWARE_VERSION = bffe7ee6b276f23822883f3d7fd7b705d12c26b9
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
Author	SHA1	Message	Date
Pascal Vizeli	51882ad715	OS: Update supervisor 123	2018-08-03 23:02:04 +00:00
Pascal Vizeli	20004ca451	OS: Bump version 1.9	2018-08-03 12:32:07 +00:00
Pascal Vizeli	ac0d1ed9af	rpi: Update kernel & firmware 4.14.58 (#139 )	2018-08-03 12:31:33 +00:00
Pascal Vizeli	2e9f5d04e2	OVA: Update kernel to 4.14.59 (#138 )	2018-08-03 12:31:14 +00:00
Pascal Vizeli	0ecf4cb293	OVA: Add support for Aeotec Zstick (#132 )	2018-08-03 12:30:59 +00:00
Pascal Vizeli	02126e0236	OS: Update supervisor 122	2018-08-03 12:30:41 +00:00
Pascal Vizeli	59cb3b4844	fix wireless settings (#124 )	2018-07-19 08:53:46 +00:00
Pascal Vizeli	ee6399a8ba	OVA: Fix serial support (#119 ) OVA: Fix serial support	2018-07-18 14:07:34 +00:00
Pascal Vizeli	1541fcab8d	Bump version 1.8	2018-07-18 12:54:21 +00:00
Pascal Vizeli	93dcc4a152	Add support for VIRTIO (#118 ) * Add support for VIRTIO * Update kernel.config	2018-07-18 12:43:19 +00:00
Pascal Vizeli	54dd3e3219	Allow more USB serial device on OVA (#115 ) * Allow more USB serial device on OVA * Update kernel.config	2018-07-18 12:43:05 +00:00
Robin	dca52c3026	Update network.md (#114 ) Clarify that you are editing the file `my-network` which is what I understand from https://www.home-assistant.io/hassio/installation/	2018-07-18 12:42:00 +00:00
Pascal Vizeli	bfcbe120b4	Bump version 1.7	2018-07-15 19:43:44 +00:00
Pascal Vizeli	38a3af6a8d	Fix prevent device tree on rpi (#107 ) * Fix prevent device tree * Update uboot-boot.sh * Update rauc-hook * Update rauc-hook	2018-07-15 19:43:18 +00:00
Pascal Vizeli	ed8f2489e0	Update OVA kernel to 4.14.55 (#108 )	2018-07-15 19:43:04 +00:00
Pascal Vizeli	fa05217ef2	Raspberry Pi node of 64bit (#103 )	2018-07-14 09:09:15 +00:00
DubhAd	f85402d781	Grammar and language tweaks (#101 ) Some grammar and language tweaks	2018-07-14 09:09:05 +00:00