From 63cad26656bb83d4269c53a642d9f8b8187760ae Mon Sep 17 00:00:00 2001
From: Marco van den Heuvel <blackystardust68@yahoo.com>
Date: Sun, 29 Apr 2018 12:12:13 -0700
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'