Merge remote-tracking branch 'upstream/master' into rd-common
Fixed compilation problem on OSX, and correct iterator usage when erasing
and deleting models.