Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-1608229-i18n-Temporary-folder

1. fix-1608229-i18n-Temporary-folder
2. Dependent merge proposals