Fixes issue #1688
Merge branch 'rc3' into s3