Method name change for retrieving SBUser
special case handling for flac uploads
Merge branch 'master' into camera