Fix committed as a part of merge with stable/icehouse branch: https://bugs.launchpad.net/mos/+bug/1344037
Fix committed as a part of merge with stable/icehouse branch: /bugs.launchpad .net/mos/ +bug/1344037
https:/