[Fix #484] Set OS X specific latex settings conditionally
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [Fix #484] Set OS X specific latex settings conditionally