Merge branch 'terencehill/keepaway_enhancements'
authorterencehill <piuntn@gmail.com>
Mon, 20 Aug 2018 19:19:15 +0000 (21:19 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 20 Aug 2018 19:19:15 +0000 (21:19 +0200)

Trivial merge