Add settings to improve export of org to LaTeX
Upstream org changes