Merge with master
Merge branch 'feature/default-query-hints' into strate-master
Merge branch 'strate-master' of github.com:Strate/doctrine2 into strate-master