From 5add387a8c89038bd810170555c2bcd9f156371e Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 03:06:33 +0000
Subject: [PATCH] Merge r7372 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7632 d57e44dd-8a1f-0410-8b47-8ef2f437770f