Merge branch 'dmitry-stuff'
Merge branch 'dmitry-stuff'
fixed path in travis
Merge branch 'master' into dmitry-stuff