Merge branch 'ftr-encrypt-pass' into dev
Merge branch 'ftr-commandline-options' into dev
Merge branch 'ftr-streaming-encryption' into dev

Conflicts:
	S3/Config.py