Merge pull request #2093 from directhex/fully-qualified-masm-path