Merge branch 'travis-rtmp'