GoldenApple now shuts down cleanly in the event of an error during
loading
Merge remote-tracking branch 'origin/master'