Upstream org changes
Listings options for export to LaTeX
Upstream org changes