Merge branch 'master' of /vagrant/go/src/code.hackerspace.pl/q3k/hspki