Merge branch 'johnhawkinson-stdin2'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 22 Oct 2016 05:10:27 +0000 (13:10 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 22 Oct 2016 05:10:27 +0000 (13:10 +0800)

Trivial merge