Merge remote-tracking branch 'hmslincs/dev' into dev
Merge remote-tracking branch 'hmslincs/dave-sean-dev' into dev
fix encoding errors in file export