Trying to fix travis-ci build.
Merge remote-tracking branch 'origin/master'