Switch to waneck travis-hx
Merge branch 'development'