1.8 - Fix conflict pull-request #7