Features: Fix GNU 4.8.1 version test.
Merge topic 'minor-cleanups' into next

5109b042 Features: Fix GNU 4.8.1 version test.