Merge branch 'master' into development
Fix proxy and missing isbn bugs.
Fix conflict.