'use strict';
Merge branch 'v3' into watcher