Merge branch 'refs/heads/hotfix/relocation'
Forgot to fix Travis URL
Merge branch 'refs/heads/hotfix/relocation' into development