Merge branch 'sg/travis-retrieve-trash-upon-failure'