Clients' image
Merge remote-tracking branch 'xebia/master'