Fixed problem with anchor watch.
Merge remote-tracking branch 'upstream/master'