github version
Merge remote-tracking branch 'github/master' into cleared