Merge "Ensure that a foreign key is always set"

For discussion here: https://github.com/globalize/globalize/commit/737f199a94ef75f294571b206ce77ff094731205