Server / Client distinction introduced
Merge remote-tracking branch 'origin/master'