Prevents timeouts on Travis during asset generation
Merge branch 'master' into feature/remove-users