Merge branch 'origin/develop' into issue-65

Conflicts:
includes/query.php