'fiddling with travis'
Merge branch 'development'