Fix default scope being overwritten. Closes #2087
Deleted obsolete .watcher file (releted to old docs generation?
Tell istanbul to ignore abstract method in abstract query generator. https://github.com/gotwarlost/istanbul/blob/master/ignoring-code-for-coverage.md
Merge remote-tracking branch 'upstream/master'