Merge branch 'michal1106-patch-1'
authorCheng Zhao <zcbenz@gmail.com>
Tue, 26 Apr 2016 01:24:57 +0000 (10:24 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 26 Apr 2016 01:24:57 +0000 (10:24 +0900)

Trivial merge