Merge fpc (3.0.4+dfsg-20+rpi1) import into refs/heads/workingbranch
authorRaspbian forward porter <root@raspbian.org>
Thu, 5 Jul 2018 13:29:50 +0000 (14:29 +0100)
committerRaspbian forward porter <root@raspbian.org>
Thu, 5 Jul 2018 13:29:50 +0000 (14:29 +0100)

Trivial merge