Merge pull request #2290 from selasley/master

Fix a recursion problem with masked arrays in get_converter
Conflicts:
	lib/matplotlib/units.py
Disable core pdf font test on TRAVIS