New PR for Bugs Bunny. Please confirm that all tests are passing!!

For now I disabled functional tests in Travis, because they're failing randomly. Before you merge this PR you should make sure that functional tests pass (check this branch out and run locally)