Merge branch 'steven7851-patch-2'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 26 Aug 2016 17:17:12 +0000 (01:17 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 26 Aug 2016 17:17:12 +0000 (01:17 +0800)

Trivial merge