[gh-386] Merge branch 'issue-386' into develop

CHANGELOG.txt

MAINTAINERS.txt

includes/bootstrap.inc

includes/cache.inc

includes/common.inc

includes/database/database.inc

includes/database/mysql/database.inc

includes/database/mysql/schema.inc

includes/database/pgsql/database.inc

includes/database/pgsql/schema.inc

includes/database/query.inc

includes/database/schema.inc

includes/database/sqlite/database.inc

includes/date.inc

includes/entity.inc

includes/errors.inc

includes/file.inc

includes/form.inc

includes/graph.inc

includes/language.inc