date changed to 2014-03-30
Merge branch 'rc0.4.0' into develop