Bug 972953 - Speed up travis r=gaye,julien