Merge fpc (3.0.4+dfsg-11) import into refs/heads/workingbranch
authorAbou Al Montacir <abou.almontacir@sfr.fr>
Sat, 30 Dec 2017 20:14:32 +0000 (20:14 +0000)
committerAbou Al Montacir <abou.almontacir@sfr.fr>
Sat, 30 Dec 2017 20:14:32 +0000 (20:14 +0000)

Trivial merge