Merge remote-tracking branch 'origin/master' into SlowtimeAdd
Small fix, curly brackets
merge with master