Merge pull request #120 from Olympic1/master

Updated MM, FS and TS
Getting ready for 0.18.6
New ZIP
ORS reconvert
New ZIP (ORS)
Merge remote-tracking branch 'upstream/master'