Untested PR for #485. Unable to test because unable to build
Merge remote-tracking branch 'upstream/0.13' into 0.13
Tested PR for #485. Had a hard time squashing this, maybe because I did a merge in between. Sorry about that!
Additional updates, should be clean now.
Add warning for bad XML parse of settings file
Merge pull request #1600 from topping/0.13

PR for #1589