CRAFTERCMS-447: Initial update to support auto watch
Merge remote-tracking branch 'alvaro/master'