upstream/0_20171205
b82eddb3 · Add mask to attribute, so we know if the property is set or not. ·