Merge pull request #2 from akolinko/stable/grizzly

Allow file_upload_temp_dir override