Post 2.4.0.REL: Update 2.4.0 to 2.5.0

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Merge pull request #935 from bjhargrave/post-2.4.0

Post 2.4.0.REL: Update 2.4.0 to 2.5.0