Sync against Rait
Merge branch 'master' of https://github.com/rasmusleppik/testly