Merge branch 'master' of git://github.com/agaida/razor-qt (#548)