Merge topic 'update-kwsys'

ff0ddff7 Merge branch 'upstream-KWSys' into update-kwsys
d49b95b8 KWSys 2017-09-21 (ff912e4d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1297