Merge branch 'franckduche-patch-1'
Merging #545
replacing deprecated method bind
Merge branch 'master' into 2.5