Apply the git-depth hack to make travis happy again.
Merge branch 'master' into develop