Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Updating files for travis
Updating travis config
Adding test target for make
Merge branch 'master' into dev