Merge branch 'production' of git://github.com/fnp/wolnelektury into production