Merge branch 'master' into sjcl
new hustle.
Merge branch 'master' into sjcl
Merge remote-tracking branch 'origin/sjcl' into sjcl