fix travis build
Merge unstable into browser