Trying to get Travis CI integration running
Merge commit '3595aa20a46adb5e3636fe400eb606505cd4a8d8'