merge some upstream PR

binarylogic/settingslogic#74