DUPE of 8358 (1 commit added)

Pull requesting for Travis with new commit + rebase