Removed spurious backquotes which are causing SQL syntax errors.
Merge branch 'dev' into test