Merge branch 'dev'
Issue #303: ping travis