resolve merge conflicts
update travis CI configuration
Merge branch 'v0.8.1' into stable
update travis CI configuration
Merge branch 'v0.8.1' into stable
Merge branch 'stable'