Merge pull request #2283 from mdboom/stdout_override

Incorrect overriding of sys.stdout
Merge pull request #2282 from mdboom/pycxx-fix-check

Extend search path for PyCXX headers
Use gswin64c, if found.
Fix a recursion problem with masked arrays in get_converter introduced in f8344a14504

If a masked array with the first element masked is passed in to get_converter, the   converter = self.get_converter(xravel()[0])  call causes a RuntimeError: maximum recursion depth exceeded.  This patch will pass the first unmasked value, or skip the call if all elements are masked.
ENH: use an artist's update() method instead of the setp() function

The artist.setp() function is a Matlab-compatible function intended
for interactive use.  Its extensive capabilities are not needed
in places like Patch.__init__, where the much faster Artist.update()
method suffices.
Merge pull request #2280 from ianthomas23/pep8_tri

PEP8 on tri module
Merge branch 'deprecations' of git://github.com/ChrisBeaumont/matplotlib into ChrisBeaumont-deprecations

Conflicts:
	lib/matplotlib/backends/backend_wxagg.py
Merge branch 'ChrisBeaumont-deprecations'
Merge pull request #2245 from mdehoon/macosx_flush_events

Adding a flush_events method to the MacOSX backend
Add a line to test masked arrays with the first element masked
Merge pull request #2291 from efiring/no_setp

ENH: use an artist's update() method instead of the setp() function
Merge pull request #2285 from lpsinger/prop_none_anchoredtext_init

Handle prop=None case in AnchoredText.__init__()
Merge pull request #2290 from selasley/master

Fix a recursion problem with masked arrays in get_converter
Merge pull request #2279 from jenshnielsen/pyparsing

Pyparsing
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
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/__init__.py
	lib/matplotlib/units.py
Merge pull request #2275 from mspacek/edit_color

Fix Qt4 figure editor color setting and getting
Upload test result images to Amazon S3
Make pyplot.bar color kwarg less ambiguous