#1236402 by joshf: Revision fix for devel generate.
Merge branch '7.x-1.x' of git.drupal.org:project/field_collection into 7.x-1.x