Merging master to content-filters

Merging changes from master to content-filters. This should help speed up
Travis.