Merge pull request #292 from chuckcranor/2.5dev

Builds with no issue and passes the regression suite as well.