fix #48
Merge remote-tracking branch 'origin/master' into server-only