fix map_copied signal handling, refs #257
Merge branch 'master' into integration