Clear the font caches on every test.  This should prevent problems where setting font properties will leak over into another test.
add convenience pagecount getter method for PdfPages
add test for pagecount getter of PdfPages
Merge pull request #2437 from mdboom/fix-randomly-failing-tests

Fix randomly failing tests
Merge pull request #2440 from megies/pdfpages_pagecount

Pdfpages pagecount convenience getter method
Move travis uploading back into .travis.yml
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/tests/test_backend_pdf.py