attribution for #175
Merge branch 'master' into 167ssl