Working upgrade path as per https://drupal.org/node/2090511 (with patch in #47)
Merge branch 'rules-update-24-9-2013' into update-24-9-2013

Conflicts:
	modules/rules/rules.info
	modules/rules/rules_admin/rules_admin.info
	modules/rules/rules_i18n/rules_i18n.info
	modules/rules/rules_scheduler/rules_scheduler.info
	modules/rules/rules_scheduler/rules_scheduler.module
	modules/rules/tests/rules_test.info