Merge branch 'master' of https://github.com/danecek/pjv-2013.git