Merge pull request #1238 from ADmad/3.0

2.4 to 3.0 merge