Try to fix travis...
Layout tweak
Merge branch 'master' into release