Submerge 3.4.6

- Exporting now works on 10.10 Yosemite and 10.11 El Capitan again.