Version bump
Merge branch 'release/2014.04.24' into develop