Merge topic 'update-kwsys'

dcc49d9c Merge branch 'upstream-kwsys' into update-kwsys
c1dde67e KWSys 2014-03-12 (dd873734)
Merge branch 'master' into next