Merge branch 'master' of git://github.com/lifo101/remote-control