Merge branch 'CYC'
authorgit <wangtsaichang@gmail.com>
Thu, 29 Jun 2017 10:19:18 +0000 (12:19 +0200)
committergit <wangtsaichang@gmail.com>
Thu, 29 Jun 2017 10:19:18 +0000 (12:19 +0200)

Trivial merge