fixed broken test
Merge remote-tracking branch 'origin/master'
support for generic file uploads - wip
support for generic file uploads - better copyspec handling