Merge "Bug 474815 - Unable to load model with LibreOffice (wrong model path)" into 0.5-maintenance