Merge branch 'bug_532_fixed_servicelist_contextmenu_crash'