develop ademnd
Merge branch 'develop' of https://github.com/calibre/test into develop
develop amend3