WPF controls moved to Controls namespace/folder
Merge from the master branch