Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 11046)
+++ /trunk/data/validator/combinations.mapcss	(revision 11047)
@@ -411,2 +411,9 @@
     throwWarning: tr("Different number of lanes in the keys {0} and {1}", "{1.key}", "{2.key}");
 }
+
+/* #13680 */
+area[golf=bunker][natural=beach] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  suggestAlternative: "natural=sand";
+  suggestAlternative: "surface=sand";
+}