Fix Spire settings in OS X app bundle.
Merge remote-tracking branch 'origin/master'