Merge branch 'master' of https://github.com/jtalks-org/functional-tests