Fix for MONDRIAN-936.  Merge from master, 8ea52ee9d8e1cb78a1bca9a6145f51936bae2192