Merge "Include showmap output in bug report." into ics-mr1