Merge branch 'master' (v0.9.6.2) into debian

diff --git a/moonshot b/moonshot
index 3317131..4e20a5e 160000 (submodule)
--- a/moonshot
+++ b/moonshot
@@ -1 +1 @@
-Subproject commit 3317131b82728a36184191263c4caec6e3d120b6
+Subproject commit 4e20a5ed5168ddffadfc8442ce0db000ea6214e0

diff --git a/ui b/ui
index a0808f8..ddfa17a 160000 (submodule)
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit a0808f885cf10e189287de784558868d57156b8f
+Subproject commit ddfa17a4856306d4dbe49ba486c4e07169bd3b54