Updating from 2.5 to 2.8
Merge pull request #2548 from julceslauhub/master

Updating from 2.5 to 2.8