Merge remote-tracking branch 'sourceforge/master'