Fixed bug where default heuristics could not be overridden.
Merge branch 'master' into patterns4