Travis Fixesasdadssasd
Merge branch 'stable'