Release: Version / Changelog Bump
Merge branch 'release/2014.04.25' into develop