Change handling of label_suffix to support django 1.5