Correct type for *.ascx files in watch task.
Merge branch 'master' into susy