Merge branch 'master', remote branch 'origin'
Further optimizations for SFTP server.
Work toward integration of Galaxy multiple file datasets.