Merge 2eff4d4f810ee71b646b5bce7c96e8c3c514d65e into 8d5887bb4e8b4e6ed577082add40d540dafb1a90
Travis updating test DB [skip ci]
Merge branch 'master' into fix-inconsistent-indentation
More fixes.
Fix merge conflict.