Allow TM.init() to alter the transfer settings (Flickr plugin needs this)
Merge branch 'develop' into feature/issue297-oauth
Merge branch 'feature/issue297-oauth' into feature/issue297-wizard