Refs #1673 Also allow plugin tests in the /Test folder
Merge remote-tracking branch 'origin/master'