Merge branch 'master' into rei/test_travis
test