Bump version
Merge branch 'release/v0.3.4_2014-01' into develop