Merge branch '3.2-stable' into astropy

Incorporates any changes in PyFITS' 3.2.x branch not already in Astropy, up through spacetelescope/PyFITS@aa78ac3ad54441cf247e8f32ef32dd685a05c6fc