Merged the two if's together as suggested by @philsturgeon - updated the Changelog to include something that may be important
2 files changed