Merge branch 'bug_539_add_multicontent_pixmap_progress'