Merge branch 'refs/heads/1.1/develop' into 1.1/master
Using DB instance in DB-based rules.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Merge branch 'refs/heads/1.1/master' into 1.1/develop