Remove: test/functional/*
Merge branch 'master' into development