Hide suggestions when copying/pasting. Related to #190
Update servers'assignments when updating replicas. Related to #345
Merge branch 'michel_345' into next
Fix for OS X
Merge branch 'michel_190' into next
Merge branch 'next' into sam_nobufpatch