Merge pull request #5086 from wigyori/for-15.05-fdm2