Update drupalorg_homebox_block_keys() to use #1219282
Browse hosting partners by type
Merge branch 'hosting-supporters-by-type' into 7.x-3.x
Issue #2161929: Add a profile field for GitHub account
Issue #2354207: Merge branch 'drumm' into 7.x-3.x

Conflicts:
	features/drupalorg_user/drupalorg_user.features.field_base.inc
	features/drupalorg_user/drupalorg_user.features.field_instance.inc
	features/drupalorg_user/drupalorg_user.field_group.inc
	features/drupalorg_user/drupalorg_user.info