Add missing bits svn merge did not catch