Merge pull request #3028 from ADmad/3.0

2.5 => 3.0 merge