Fixed erronous library file and module def file (caused linked exe to load
wrong dll)
Merge remote-tracking branch 'upstream/master'