3.4 changes
Merge branch 'master' of https://github.com/unplugged/unplugged-tools