bumped version string
Merge branch 'release/2013-06.05' into develop