kingtim Merge branch 'master' into stdin