Apply the patch suggested here:
https://sft.its.cern.ch/jira/browse/ROOT-6302