Resolve travis issues.
Merge remote-tracking branch 'origin/feature/create-translation-objects' into feature/create-translation-objects