+ preferences for network_buffer_size option
Merge remote-tracking branch 'orig/master'
Merge remote-tracking branch 'upstream/gtk3'
Merge remote-tracking branch 'popsul/master'