Add export function.
Add export function.
Merge branch 'master' into tincan
Change population of export options to "on demand", as things can change between setting up
the TOC screen in the first place and when the Export button is clicked.
Merge branch 'master' into tincan