UPDATES
Merge branch 'master' of https://github.com/murix/energia-0101E0011