Merge "Forgot the comma in previous patch..."