bumped version number to 2014.04.21
Merge branch 'release-2014.04.21' into develop