Merge pull request #1338 from ppekrol/master

2.5 to 3.0 merge