Automatically join relations when using Criteria::where()
Merge origin/master