acdd879
- Put Fedora 23 specific fix under a conditional, so that the change can be backported to other branches easily.