Regression in before_where of publishable behaviour
Merge branch 'rel/d' of git://github.com/novius-os/core into rel/d