Updated version to 2014.04.99
Merge branch 'bug-11626-update-version-2014-04'