Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge