Merge branch 'jdiamond-foreground'
authorjoan <joan@abyz.co.uk>
Sun, 30 Oct 2016 23:34:50 +0000 (23:34 +0000)
committerjoan <joan@abyz.co.uk>
Sun, 30 Oct 2016 23:34:50 +0000 (23:34 +0000)

Trivial merge