Merge master into validation

modules/ui/field.js

@@ -69,6 +69,14 @@ export function uiField(context, presetField, entity, options) {
 
     function isPresent() {
         return _some(field.keys, function(key) {
+            if (field.type === 'multiCombo') {
+                for (var tagKey in _tags) {
+                    if (tagKey.indexOf(key) === 0) {
+                        return true;
+                    }
+                }
+                return false;
+            }
             return _tags[key] !== undefined;
         });
     }

modules/ui/fields/cycleway.js

@@ -34,9 +34,10 @@ export function uiFieldCycleway(field, context) {
             .attr('class', 'labeled-inputs')
             .merge(div);
 
+        var keys = ['cycleway:left', 'cycleway:right'];
 
         items = div.selectAll('li')
-            .data(field.keys);
+            .data(keys);
 
         var enter = items.enter()
             .append('li')