Miro 6.0
Merge pull request #421 from fanquake/Miro-6-0

Miro 6.0