Merge branch 'release/20140402' into develop
and now for a working edition
additional tests
Merge branch 'develop'