Merge branch 'modman-update-fix'