Issue #2289241 by mariacha1: Warning: array_keys() expects parameter 1 to be array, null given in drupal_schema_fields_sql()
Merge branch '7.x-2.x' of git.drupal.org:project/eck into 7.x-2.x

Conflicts:
	eck.features.inc