Merge pull request #1336 from roger-/micropython