Merge "Add new-inline-tags to tidy.conf"