Travis: Initiating build for commit 'd91c2e2f47f6361aef783d60824f289ecf66dd63' on branch '5807': Initial refactoring for 5807, seeing if tests pass.