Merge "IMapper: change an error message" into qt-dev
am: 52f5328bd3

Change-Id: If3720d55a4f0d98913577fbe2bcb2f6978ef5eba