I picked that up from travis merging master on my branch