Update mysql2.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock
Update use of deprecated #update_attribute. Related to #460.
Make Company Directors go through the same pending -> active flow as other Organisation types.
Don't try to redeem invitations for already-active Members. Addresses #460.
Don't include Board composition subrule for a member class with no Board representation.
Merge branch 'coop-release' into oneclick-uk-coop