Merge branch 'johnhawkinson-stdin2'