v2.5.0

#### Summary:

This merge should be tagged as 2.5.0. There are no code changes.

#### Intended Effect:

The merge should be tagged as 2.5.0.

#### How to Verify:

Built doc is labeled as 2.5.0.

#### Side Effects:

None.

#### Documentation:

Already taken care of.

#### Reviewer Suggestions: 

No one.