Merge pull request #1918 from mikeller/remove_local_mk