update contrib
update exception, Client
Merge remote-tracking branch 'upstream/master'