Now fixed in 141219877

In this edit I acidently made a change to the Brandling Villa. This is clearly wrong and I will revert it as soon as I can.

This resolves note #2698840 and note #2698847.