Merge changes from dev-wee to dev. Created namematch.php which is empty now.