Preparing for 2.5

Code cleanup in readiness for 2.5

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Preparing for 2.5

Code cleanup in readiness for 2.5

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Merge branch 'devel'